[jboss-svn-commits] JBL Code SVN: r26887 - labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-06-09 10:15:32 -0400 (Tue, 09 Jun 2009)
New Revision: 26887

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java
Log:
Added normalization of URL

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java	2009-06-09 13:43:48 UTC (rev 26886)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesUserBean.java	2009-06-09 14:15:32 UTC (rev 26887)
@@ -1,5 +1,7 @@
 package org.jboss.labs.clearspace.plugin.nfm.dao;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Date;
@@ -12,7 +14,6 @@
 import com.jivesoftware.community.Permissions;
 import com.jivesoftware.community.cache.Cacheable;
 import com.jivesoftware.community.webservices.WSUser;
-import com.jivesoftware.util.StringUtils;
 
 /**
  * Nukes User bean. Implementation taken from cs-nukes-login module.<br>
@@ -220,12 +221,10 @@
 
 		profile.put(COMPANY_SIZE, rs.getString("pn_companysize"));
 
-		// bug fix of empty ULR - must be null instead of empty string
-		String url = rs.getString("pn_url");
-		if (url != null && url.length() > 0) {
+		// bug fix URL must be valid URL. If not it's not showed and logged exception
+		String url = normalizeURL(rs.getString("pn_url"));
+		if (url != null) {
 		  profile.put(URL, rs.getString("pn_url"));
-		} else {
-		  profile.put(URL, null);
 		}
 
 		profile.put(BIOGRAPHY, rs.getString("pn_bio"));
@@ -259,6 +258,27 @@
 		profile = translateProfileFields(profile);
 
 	}
+	
+	/**
+	 * Normalize String representation of URL to valid URL
+	 * @param url
+	 * @return if URL is not valid then null is returned.
+	 */
+	private String normalizeURL(String url) {
+          if (url == null || url.length() < 1) {
+            return url;
+          }
+          if (!url.startsWith("http://")) {
+            url = "http://" + url;
+          }
+          try {
+            new URL(url);
+            return url;
+          } catch (MalformedURLException e) {
+            // not valid URL
+            return null;
+          }
+        }
 
 	private Map<String, String> translateProfileFields(
 			Map<String, String> profile) {