Author: rhauch
Date: 2009-11-26 15:40:53 -0500 (Thu, 26 Nov 2009)
New Revision: 1360
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/Changes.java
trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrSession.java
Log:
DNA-548 Added a helper method in JcrSession to access the ExecutionContext.getId().
Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/Changes.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/Changes.java 2009-11-26
20:37:08 UTC (rev 1359)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/Changes.java 2009-11-26
20:40:53 UTC (rev 1360)
@@ -170,6 +170,7 @@
if (obj instanceof Changes) {
Changes that = (Changes)obj;
if (!this.getProcessId().equals(that.getProcessId())) return false;
+ if (!this.getContextId().equals(that.getContextId())) return false;
if (!this.getSourceName().equals(that.getSourceName())) return false;
if (!this.getTimestamp().equals(that.getTimestamp())) return false;
if (!this.getUserName().equals(that.getUserName())) return false;
Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrSession.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrSession.java 2009-11-26 20:37:08 UTC
(rev 1359)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrSession.java 2009-11-26 20:40:53 UTC
(rev 1360)
@@ -185,6 +185,10 @@
return this.executionContext;
}
+ String sessionId() {
+ return this.executionContext.getId();
+ }
+
JcrNodeTypeManager nodeTypeManager() {
return this.workspace.nodeTypeManager();
}
@@ -204,7 +208,7 @@
final Collection<String> lockTokens() {
return lockTokens;
}
-
+
Graph.Batch createBatch() {
return graph.batch();
}
@@ -306,11 +310,11 @@
if (lockTokens.contains(lt)) {
return;
}
-
+
if (workspace().lockManager().isHeldBySession(lt)) {
throw new LockException(JcrI18n.lockTokenAlreadyHeld.text(lt));
}
-
+
workspace().lockManager().setHeldBySession(lt, true);
lockTokens.add(lt);
}
@@ -849,7 +853,7 @@
lockTokens.remove(lt);
return;
}
-
+
if (lock.isSessionScoped()) {
throw new IllegalStateException(JcrI18n.cannotRemoveLockToken.text(lt));
}
Show replies by date