Author: sdumitriu
Date: 2008-02-27 18:57:20 +0100 (Wed, 27 Feb 2008)
New Revision: 8042

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
Log:
[misc] NPE during tests. Introduced in rev. 7545 (XWIKI-2051)


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
        2008-02-27 16:36:32 UTC (rev 8041)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
        2008-02-27 17:57:20 UTC (rev 8042)
@@ -114,15 +114,15 @@
      */
     public BaseClass getxWikiClass(XWikiContext context)
     {
+        if ((context == null) || (context.getWiki() == null)) {
+            return null;
+        }
         String name = getClassName();
         String wiki = getWiki();
 
         String database = context.getDatabase();
         try {
             context.setDatabase(wiki);
-
-            if ((context == null) || (context.getWiki() == null))
-                return null;
             return context.getWiki().getClass(name, context);
         } catch (Exception e) {
             e.printStackTrace();

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to