shuber 2005/03/31 19:42:34 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/usermanager JahiaDBUser.java
JahiaLDAPUser.java
JahiaUserManagerDBProvider.java
JahiaUserManagerLDAPProvider.java
Log:
Fix NPE when creating new site.
Revision Changes Path
1.13.4.2.2.2 +28 -13
jahia/src/java/org/jahia/services/usermanager/JahiaDBUser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaDBUser.java.diff?r1=1.13.4.2.2.1&r2=1.13.4.2.2.2&f=h
1.16.4.4.2.2 +26 -13
jahia/src/java/org/jahia/services/usermanager/JahiaLDAPUser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaLDAPUser.java.diff?r1=1.16.4.4.2.1&r2=1.16.4.4.2.2&f=h
1.20.4.6.2.2 +7 -2
jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerDBProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerDBProvider.java.diff?r1=1.20.4.6.2.1&r2=1.20.4.6.2.2&f=h
1.32.4.10.2.7 +2 -2
jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java.diff?r1=1.32.4.10.2.6&r2=1.32.4.10.2.7&f=h
Index: JahiaDBUser.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaDBUser.java,v
retrieving revision 1.13.4.2.2.1
retrieving revision 1.13.4.2.2.2
diff -u -r1.13.4.2.2.1 -r1.13.4.2.2.2
--- JahiaDBUser.java 24 Mar 2005 16:05:02 -0000 1.13.4.2.2.1
+++ JahiaDBUser.java 31 Mar 2005 17:42:33 -0000 1.13.4.2.2.2
@@ -215,7 +215,11 @@
* only modifications through setProperty() are supported and serialized.
*/
public Properties getProperties () {
- return mProperties.getProperties();
+ if (mProperties != null) {
+ return mProperties.getProperties();
+ } else {
+ return null;
+ }
}
/**
@@ -276,6 +280,10 @@
public synchronized boolean removeProperty (String key) {
boolean result = false;
+ if (mProperties == null) {
+ return result;
+ }
+
if ((key != null) && (key.length () > 0) &&
(!mProperties.isReadOnly(key))) {
JahiaUserDBUtils utils = JahiaUserDBUtils.getInstance ();
if (utils != null) {
@@ -378,6 +386,10 @@
public synchronized boolean setProperty (String key, String value) {
boolean result = false;
+ if (mProperties == null) {
+ return result;
+ }
+
if ((key != null) && (value != null) &&
(!mProperties.isReadOnly(key))) {
JahiaUserDBUtils utils = JahiaUserDBUtils.getInstance ();
@@ -449,21 +461,24 @@
StringBuffer output = new StringBuffer ("Detail of user [" +
mUsername + "]\n");
output.append (" - ID [" + Integer.toString (mID) + "]");
output.append (" - password [" + mPassword + "]\n");
- output.append (" - properties :");
- Iterator nameIter = mProperties.propertyNameIterator();
- String name;
- if (nameIter.hasNext ()) {
- output.append ("\n");
- while (nameIter.hasNext ()) {
- name = (String) nameIter.next ();
- output.append (
- " " + name + " -> [" + (String)
mProperties.getProperty (name) + "]\n");
+ if (mProperties != null) {
+ output.append(" - properties :");
+
+ Iterator nameIter = mProperties.propertyNameIterator();
+ String name;
+ if (nameIter.hasNext()) {
+ output.append("\n");
+ while (nameIter.hasNext()) {
+ name = (String) nameIter.next();
+ output.append(
+ " " + name + " -> [" +
+ (String) mProperties.getProperty(name) + "]\n");
+ }
+ } else {
+ output.append(" -no properties-\n");
}
- } else {
- output.append (" -no properties-\n");
}
-
return output.toString ();
}
Index: JahiaLDAPUser.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaLDAPUser.java,v
retrieving revision 1.16.4.4.2.1
retrieving revision 1.16.4.4.2.2
diff -u -r1.16.4.4.2.1 -r1.16.4.4.2.2
--- JahiaLDAPUser.java 24 Mar 2005 16:05:02 -0000 1.16.4.4.2.1
+++ JahiaLDAPUser.java 31 Mar 2005 17:42:33 -0000 1.16.4.4.2.2
@@ -160,7 +160,11 @@
* only modifications through setProperty() are supported and serialized.
*/
public Properties getProperties () {
- return mProperties.getProperties();
+ if (mProperties != null) {
+ return mProperties.getProperties();
+ } else {
+ return null;
+ }
}
/**
@@ -212,6 +216,9 @@
*/
public synchronized boolean removeProperty (String key) {
boolean result = false;
+ if (mProperties == null) {
+ return result;
+ }
if ((key != null) && (key.length () > 0) &&
(!mProperties.isReadOnly(key))) {
// Remove these lines if LDAP problem --------------------
@@ -283,6 +290,9 @@
*/
public synchronized boolean setProperty (String key, String value) {
boolean result = false;
+ if (mProperties == null) {
+ return result;
+ }
if ((key != null) && (value != null) &&
(!mProperties.isReadOnly(key))) {
// Remove these lines if LDAP problem --------------------
@@ -399,21 +409,24 @@
StringBuffer output = new StringBuffer ("Detail of user [" +
mUsername + "]\n");
output.append (" - ID [" + Integer.toString (mID) + "]");
output.append (" - password [" + mPassword + "]\n");
- output.append (" - properties :");
- Iterator nameIter = mProperties.propertyNameIterator ();
- String name;
- if (nameIter.hasNext()) {
- output.append ("\n");
- while (nameIter.hasNext()) {
- name = (String) nameIter.next();
- output.append (
- " " + name + " -> [" + (String)
mProperties.getProperty (name) + "]\n");
+ if (mProperties != null) {
+ output.append(" - properties :");
+
+ Iterator nameIter = mProperties.propertyNameIterator();
+ String name;
+ if (nameIter.hasNext()) {
+ output.append("\n");
+ while (nameIter.hasNext()) {
+ name = (String) nameIter.next();
+ output.append(
+ " " + name + " -> [" +
+ (String) mProperties.getProperty(name) + "]\n");
+ }
+ } else {
+ output.append(" -no properties-\n");
}
- } else {
- output.append (" -no properties-\n");
}
-
return output.toString ();
}
Index: JahiaUserManagerDBProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaUserManagerDBProvider.java,v
retrieving revision 1.20.4.6.2.1
retrieving revision 1.20.4.6.2.2
diff -u -r1.20.4.6.2.1 -r1.20.4.6.2.2
--- JahiaUserManagerDBProvider.java 24 Mar 2005 16:05:02 -0000
1.20.4.6.2.1
+++ JahiaUserManagerDBProvider.java 31 Mar 2005 17:42:34 -0000
1.20.4.6.2.2
@@ -158,8 +158,13 @@
// Create the user
JahiaDBUser user = null;
- user = new JahiaDBUser (userID, name, password, userKey, siteID, new
UserProperties(properties, false));
-
+ if (properties != null) {
+ user = new JahiaDBUser(userID, name, password, userKey, siteID,
+ new UserProperties(properties, false));
+ } else {
+ user = new JahiaDBUser(userID, name, password, userKey, siteID,
+ null);
+ }
// add the user into the cache if the user could be added into the
database.
if (addUserIntoDB (userID, name, password, userKey, siteID,
properties)) {
mUserCache.put ("k"+user.getName(), user);
Index: JahiaUserManagerLDAPProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaUserManagerLDAPProvider.java,v
retrieving revision 1.32.4.10.2.6
retrieving revision 1.32.4.10.2.7
diff -u -r1.32.4.10.2.6 -r1.32.4.10.2.7
--- JahiaUserManagerLDAPProvider.java 24 Mar 2005 16:05:02 -0000
1.32.4.10.2.6
+++ JahiaUserManagerLDAPProvider.java 31 Mar 2005 17:42:34 -0000
1.32.4.10.2.7
@@ -578,7 +578,7 @@
}
}
} catch (SizeLimitExceededException slee) {
-// we just return the list as it is
+ // we just return the list as it is
logger.debug(
"Search generated more than configured maximum search limit
in " +
DEFAULT_CONFIGURATION_FILE +
@@ -832,7 +832,7 @@
private JahiaLDAPUser lookupUserInLDAP (String userKey) {
JahiaLDAPUser user = null;
- // probl�me reconnection...
+
try {
SearchResult sr = getPublicUser (getPublicContext (false),
ldapProperties.getProperty (UID_SEARCH_ATTRIBUTE_PROP), userKey);
if (sr == null) {
