You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/04/10 19:06:18 UTC

svn commit: r932765 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java

Author: reto
Date: Sat Apr 10 17:06:18 2010
New Revision: 932765

URL: http://svn.apache.org/viewvc?rev=932765&view=rev
Log:
avoiding null pointer when there is no user associated to context

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java?rev=932765&r1=932764&r2=932765&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java Sat Apr 10 17:06:18 2010
@@ -54,16 +54,22 @@ public class UserLoginNode implements Us
 		GraphNode agent = AccessController.doPrivileged(new PrivilegedAction<GraphNode>() {
 			@Override
 			public GraphNode run() {
-				return userManager.getUserGraphNode(UserUtil.getUserName(context));
+				final String userName = UserUtil.getUserName(context);
+				if (userName == null) {
+					return null;
+				}
+				return userManager.getUserGraphNode(userName);
 			}
 		});
-		if (!(node.getObjects(PLATFORM.user).hasNext())) {
-			node.addProperty(PLATFORM.user, agent.getNode());
-		} else {
-			Resource user = node.getObjects(PLATFORM.user).next();
-			agent.replaceWith((NonLiteral) user);
+		if (agent != null) {
+			if (!(node.getObjects(PLATFORM.user).hasNext())) {
+				node.addProperty(PLATFORM.user, agent.getNode());
+			} else {
+				Resource user = node.getObjects(PLATFORM.user).next();
+				agent.replaceWith((NonLiteral) user);
+			}
+			node.getGraph().addAll(agent.getGraph());
 		}
-		node.getGraph().addAll(agent.getGraph());
 		return node;
 	}
 }