[xwiki-notifications] r6355 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web

[SVN]

Author: sdumitriu
Date: 2007-12-12 16:51:09 +0100 (Wed, 12 Dec 2007)
New Revision: 6355

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
Log:
XWIKI-1947: At plugin initialization, the context does not contain an URLFactory
Fix failing tests.


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
    2007-12-12 14:44:42 UTC (rev 6354)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
    2007-12-12 15:51:09 UTC (rev 6355)
@@ -62,6 +62,10 @@
     public void init(XWikiContext context)
     {
         URL url = context.getURL();
+        if (url == null) {
+            // Cannot initialize, probably running tests...
+            return;
+        }
         String path = url.getPath();
         String servletpath = context.getRequest().getServletPath();
 
@@ -85,7 +89,7 @@
             } else if 
(context.getRequest().getServletPath().startsWith("/testbin")) {
                 actionPath = "testbin/";
             } else {
-                actionPath = 
context.getWiki().Param("xwiki.defaultactionpath", "xwiki/");
+                actionPath = 
context.getWiki().Param("xwiki.defaultactionpath", "bin/");
             }
         }
 

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications