[xwiki-notifications] r6722 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl

[SVN]

Author: sdumitriu
Date: 2008-01-10 13:28:56 +0100 (Thu, 10 Jan 2008)
New Revision: 6722

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/VisitStats.java
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java
Log:
Fix possible NPE or "cannot insert NULL" errors.


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/VisitStats.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/VisitStats.java
 2008-01-10 12:26:43 UTC (rev 6721)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/VisitStats.java
 2008-01-10 12:28:56 UTC (rev 6722)
@@ -23,6 +23,8 @@
 
 import java.util.Date;
 
+import org.apache.commons.lang.StringUtils;
+
 public class VisitStats extends XWikiStats {
     protected VisitStats oldObject = null;
 
@@ -111,7 +113,7 @@
     }
 
     public void setCookie(String cookie) {
-        setStringValue("cookie", cookie);
+        setStringValue("cookie", StringUtils.defaultString(cookie));
     }
 
     public String getIP() {
@@ -127,7 +129,7 @@
     }
 
     public void setUserAgent(String userAgent) {
-        setStringValue("userAgent", userAgent);
+        setStringValue("userAgent", StringUtils.defaultString(userAgent));
     }
 
     public String getUser() {

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java
      2008-01-10 12:26:43 UTC (rev 6721)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java
      2008-01-10 12:28:56 UTC (rev 6722)
@@ -397,8 +397,11 @@
 
         if (vobject==null) {
             // we need to create the session
-            if (ip==null) ip = request.getRemoteAddr();
-            if (ua==null) ua = request.getHeader("User-Agent");
+            if (ip == null) ip = request.getRemoteAddr();
+            if (ua == null) ua = request.getHeader("User-Agent");
+            if (ua == null) {
+                ua = "";
+            }
             String uniqueID;
 
             if (newcookie) {

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