You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/03/23 19:06:43 UTC
svn commit: r1304532 -
/incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/impl/JCRRegistry.java
Author: samindaw
Date: Fri Mar 23 18:06:43 2012
New Revision: 1304532
URL: http://svn.apache.org/viewvc?rev=1304532&view=rev
Log:
handling the case where the root node session has expired
Modified:
incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/impl/JCRRegistry.java
Modified: incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/impl/JCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/impl/JCRRegistry.java?rev=1304532&r1=1304531&r2=1304532&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/impl/JCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/impl/JCRRegistry.java Fri Mar 23 18:06:43 2012
@@ -223,7 +223,7 @@ public class JCRRegistry extends Observa
protected Node getRootNode(Session session) throws RepositoryException {
String ROOT_NODE_TEXT = "root";
- if (!getSessionNodes().containsKey(null)){
+ if (!getSessionNodes().containsKey(null) || !getSessionNodes().get(null).get(ROOT_NODE_TEXT).getSession().isLive()){
getSessionNodes().put(null, new HashMap<String, Node>());
getSessionNodes().get(null).put(ROOT_NODE_TEXT, session.getRootNode());
}
@@ -304,8 +304,12 @@ public class JCRRegistry extends Observa
Node node1 = null;
try {
// System.out.println("node extracted");
- node1 = node.getNode(name);
- sessionNodes.get(node).put(name, node1);
+// if (node==null){ //root node
+// node1=getSession().getRootNode();
+// }else{
+ node1 = node.getNode(name);
+// }
+ sessionNodes.get(node).put(name, node1);
} catch (PathNotFoundException pnfe) {
node1 = node.addNode(name);
} catch (RepositoryException e) {