r1022 - in xwiki/trunk/src/main/java/com/xpn/xwiki: . web

[Ludovic Dubost]

Author: ludovic
Date: 2006-03-31 03:04:11 +0200 (Fri, 31 Mar 2006)
New Revision: 1022

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
   xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
Log:
Fix xmlrpc

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-03-31 01:01:17 UTC (rev 1021)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java	2006-03-31 01:04:11 UTC (rev 1022)
@@ -168,6 +168,7 @@
          if (context.getRequest().getRequestURL().indexOf("/testbin/")!=-1) {
              xwikiname = "xwikitest";
              context.setDatabase("xwikitest");
+             context.setOriginalDatabase("xwikitest");
          }
         } catch (Exception e) {}
 
@@ -2494,9 +2495,9 @@
                         + database.substring(0, 1).toUpperCase()
                         + database.substring(1), context);
                 BaseObject serverobject = doc.getObject("XWiki.XWikiServerClass", 0);
-                String server = serverobject.getStringValue("server");
-                int mode = serverobject.getIntValue("secure");
+                String server = (serverobject!=null) ? serverobject.getStringValue("server") : null;
                 if (server != null) {
+                    int mode = serverobject.getIntValue("secure");
                     serverurl = ((mode == 1) ? "https://" : "http://")
                             + server + "/";
                 }
@@ -2507,7 +2508,10 @@
             }
         }
 
-        return new URL(serverurl);
+        if (serverurl!=null)
+         return new URL(serverurl);
+        else
+         return null;
     }
 
     public String getURL(String fullname, String action, XWikiContext context) throws XWikiException {

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java	2006-03-31 01:01:17 UTC (rev 1021)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java	2006-03-31 01:04:11 UTC (rev 1022)
@@ -109,7 +109,11 @@
         if (xwikidb.equals(context.getOriginalDatabase()))
             return serverURL;
         else {
-            return context.getWiki().getServerURL(xwikidb, context);
+            URL url = context.getWiki().getServerURL(xwikidb, context);
+            if (url==null)
+             return serverURL;
+            else
+             return url; 
         }
     }