[dna-commits] DNA SVN: r1296 - trunk/dna-jcr/src/main/java/org/jboss/dna/jcr.

[dna-commits at lists.jboss.org]

Author: bcarothers
Date: 2009-10-19 16:26:00 -0400 (Mon, 19 Oct 2009)
New Revision: 1296

Modified:
   trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNode.java
   trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/WorkspaceLockManager.java
Log:
DNA-457 Add JSR-170 Locking Optional Feature

Quick change to address some Java5/6 compilation issues.

Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNode.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNode.java	2009-10-19 19:54:55 UTC (rev 1295)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/AbstractJcrNode.java	2009-10-19 20:26:00 UTC (rev 1296)
@@ -1368,7 +1368,7 @@
             nodesToVisit.add(nodeInfo());
 
             while (!nodesToVisit.isEmpty()) {
-                Node<JcrNodePayload, JcrPropertyPayload> node = nodesToVisit.pop();
+                Node<JcrNodePayload, JcrPropertyPayload> node = nodesToVisit.get(nodesToVisit.size() - 1);
                 if (session().workspace().lockManager().lockFor(node.getLocation()) != null) throw new LockException(
                                                                                                                      JcrI18n.parentAlreadyLocked.text(this.location,
                                                                                                                                                       node.getLocation()));

Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/WorkspaceLockManager.java
===================================================================
--- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/WorkspaceLockManager.java	2009-10-19 19:54:55 UTC (rev 1295)
+++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/WorkspaceLockManager.java	2009-10-19 20:26:00 UTC (rev 1296)
@@ -270,38 +270,31 @@
             final AbstractJcrNode node = cache.findJcrNode(Location.create(nodeUuid));
             final JcrSession session = cache.session();
             return new Lock() {
-                @Override
                 public String getLockOwner() {
                     return lockOwner;
                 }
 
-                @Override
                 public String getLockToken() {
                     String uuidString = lockUuid.toString();
                     return session.lockTokens().contains(uuidString) ? uuidString : null;
                 }
 
-                @Override
                 public Node getNode() {
                     return node;
                 }
 
-                @Override
                 public boolean isDeep() {
                     return deep;
                 }
 
-                @Override
                 public boolean isLive() throws RepositoryException {
                     return workspaceLocksByNodeUuid.containsKey(nodeUuid);
                 }
 
-                @Override
                 public boolean isSessionScoped() {
                     return sessionScoped;
                 }
 
-                @Override
                 public void refresh() throws LockException, RepositoryException {
                     if (getLockToken() == null) {
                         throw new LockException(JcrI18n.notLocked.text(node.location));