You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/02/12 15:40:46 UTC

svn commit: r620815 - /incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java

Author: cziegeler
Date: Tue Feb 12 06:40:43 2008
New Revision: 620815

URL: http://svn.apache.org/viewvc?rev=620815&view=rev
Log:
Bug fixing.

Modified:
    incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java

Modified: incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=620815&r1=620814&r2=620815&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java (original)
+++ incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Tue Feb 12 06:40:43 2008
@@ -135,7 +135,7 @@
                         info.nodePath = eventNode.getPath();
                     } catch (RepositoryException re ) {
                         // something went wrong, so let's log it
-                        this.logger.error("Exception during writing new job to repository.", re);
+                        this.logger.error("Exception during writing new job '" + this.getNodeName(event) + "' to repository.", re);
                     }
                 } else {
                     try {
@@ -149,19 +149,16 @@
                         if ( foundNode != null ) {
                             // if the node is locked, someone else was quicker
                             // and we don't have to process this job
-                            if ( foundNode.isLocked() ) {
-                                foundNode = null;
-                            } else {
+                            if ( !foundNode.isLocked() ) {
                                 // node is already in repository, so we just overwrite it
                                 try {
                                     foundNode.remove();
                                     parentNode.save();
+                                    foundNode = null;
                                 } catch (RepositoryException re) {
                                     // if anything goes wrong, it means that (hopefully) someone
                                     // else is processing this node
-                                    foundNode = null;
                                 }
-
                             }
                         }
                         if ( foundNode == null ) {