[jboss-svn-commits] JBL Code SVN: r35519 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src: main/java/org/jboss/labs/sbs/plugin/nukesauth and 1 other directory.

Thu Oct 14 07:38:45 EDT 2010

Author: lkrzyzanek
Date: 2010-10-14 07:38:44 -0400 (Thu, 14 Oct 2010)
New Revision: 35519

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java
Log:
Fixed ORG-792

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
===================================================================

--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml	2010-10-14 09:22:08 UTC (rev 35518)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml	2010-10-14 11:38:44 UTC (rev 35519)
@@ -10,13 +10,19 @@
 
   <body>
 
+    <release version="1.1.1" date="2010-??-??" description="Bugfix release">
+      <action type="fix" dev="lkrzyzan" date="2010-10-14">
+        <fixes issue="ORG-792" />
+      </action>
+    </release>
+
     <release version="1.1.0" date="2010-08-24"
       description="Upgraded to work with Nukes in Mysql5 and SBS 4.5">
       <action type="update" dev="lkrzyzan" date="2010-08-18">
         <fixes issue="ORG-658" />
       </action>
-      <action type="add" dev="lkrzyzan" date="2010-08-24" >
-        <fixes issue="ORG-700"/>
+      <action type="add" dev="lkrzyzan" date="2010-08-24">
+        <fixes issue="ORG-700" />
       </action>
     </release>
 

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java	2010-10-14 09:22:08 UTC (rev 35518)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/SbsAccountManagerImpl.java	2010-10-14 11:38:44 UTC (rev 35519)
@@ -213,7 +213,8 @@
   public List<String> getDuplicateAccountUsernames(User user) {
     Map<Long, ProfileFieldValue> profile = profileManager.getProfile(user);
     ProfileFieldValue profileField = profile.get(duplicateAccountsFiled);
-    if (profileField == null) {
+    // added condition on profileField.getValue() - fix of ORG-792
+    if (profileField == null || profileField.getValue() == null) {
       return null;
     }
     StringTokenizer st = new StringTokenizer(profileField.getValue(), duplicateAccountsDeliminer);

