jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r157070 - in incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: ItemImpl.java NodeImpl.java nodetype/ValueConstraint.java version/persistence/InternalVersionHistoryImpl.java version/persistence/NativePVM.java
Date Fri, 11 Mar 2005 11:09:48 GMT
Author: stefan
Date: Fri Mar 11 03:09:44 2005
New Revision: 157070

URL: http://svn.apache.org/viewcvs?view=rev&rev=157070
Log:
- fixed bug in NumericValueConstraint
- corrected some inline-comments

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java?view=diff&r1=157069&r2=157070
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl.java Fri Mar 11
03:09:44 2005
@@ -1242,8 +1242,8 @@
                     log.debug(msg);
                     throw new RepositoryException(msg, e);
                 } finally {
-                    // update operation failed, cancel all modifications
                     if (!succeeded) {
+                        // update operation failed, cancel all modifications
                         stateMgr.cancel();
                     }
                 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&r1=157069&r2=157070
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl.java Fri Mar 11
03:09:44 2005
@@ -2579,7 +2579,7 @@
         // check state of this instance
         sanityCheck();
 
-        // aquire session of other workspace (throws NoSuchWorkspaceException)
+        // acquire session of other workspace (throws NoSuchWorkspaceException)
         // @todo FIXME need to get session with same credentials as current
         SessionImpl srcSession = rep.getSystemSession(workspaceName);
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java?view=diff&r1=157069&r2=157070
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java
Fri Mar 11 03:09:44 2005
@@ -322,7 +322,7 @@
         switch (value.getType()) {
             case PropertyType.LONG:
                 check((Long) value.internalValue());
-                break;
+                return;
 
             case PropertyType.DOUBLE:
                 check((Double) value.internalValue());
@@ -335,8 +335,8 @@
                     check(length);
                 } else {
                     log.warn("failed to determine length of binary value");
-                    return;
                 }
+                return;
 
             default:
                 String msg = "numeric constraint can not be applied to value of type: "

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java?view=diff&r1=157069&r2=157070
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java
Fri Mar 11 03:09:44 2005
@@ -274,8 +274,8 @@
                 stateMgr.update();
                 succeeded = true;
             } finally {
-                // update operation failed, cancel all modifications
                 if (!succeeded) {
+                    // update operation failed, cancel all modifications
                     stateMgr.cancel();
                 }
             }
@@ -326,8 +326,8 @@
         } catch (RepositoryException e) {
             throw new VersionException("Error while storing modifications", e);
         } finally {
-            // update operation failed, cancel all modifications
             if (!succeeded) {
+                // update operation failed, cancel all modifications
                 stateMgr.cancel();
             }
         }
@@ -358,8 +358,8 @@
         } catch (RepositoryException e) {
             throw new VersionException("Unable to store modifications", e);
         } finally {
-            // update operation failed, cancel all modifications
             if (!succeeded) {
+                // update operation failed, cancel all modifications
                 stateMgr.cancel();
             }
         }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java?view=diff&r1=157069&r2=157070
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java
Fri Mar 11 03:09:44 2005
@@ -342,8 +342,8 @@
         } catch (ItemStateException e) {
             throw new RepositoryException(e);
         } finally {
-            // update operation failed, cancel all modifications
             if (!succeeded) {
+                // update operation failed, cancel all modifications
                 stateMgr.cancel();
             }
         }
@@ -567,8 +567,8 @@
         } catch (ItemStateException e) {
             throw new RepositoryException(e);
         } finally {
-            // update operation failed, cancel all modifications
             if (!succeeded) {
+                // update operation failed, cancel all modifications
                 stateMgr.cancel();
             }
         }



Mime
View raw message