Author: sdumitriu
Date: 2008-02-27 21:05:27 +0100 (Wed, 27 Feb 2008)
New Revision: 8045
Modified:
xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
Log:
[misc] Fixed NPE occuring durng some tests. Merged from trunk.
Modified:
xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
2008-02-27 19:59:30 UTC (rev 8044)
+++
xwiki-platform/core/branches/xwiki-core-1.3/xwiki-core/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
2008-02-27 20:05:27 UTC (rev 8045)
@@ -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
