You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/09/20 18:57:34 UTC

svn commit: r577815 - /jackrabbit/branches/1.3/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java

Author: jukka
Date: Thu Sep 20 09:57:33 2007
New Revision: 577815

URL: http://svn.apache.org/viewvc?rev=577815&view=rev
Log:
1.3: Merged revision 571397 (JCR-1071)

Modified:
    jackrabbit/branches/1.3/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java

Modified: jackrabbit/branches/1.3/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java?rev=577815&r1=577814&r2=577815&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java (original)
+++ jackrabbit/branches/1.3/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java Thu Sep 20 09:57:33 2007
@@ -570,7 +570,7 @@
         }
         Item contextItem = context.getImportRoot();
         try {
-            return contextItem != null && contextItem.isNode() && (!isCollection || ((Node)contextItem).hasNode(JcrConstants.JCR_CONTENT));
+            return contextItem != null && contextItem.isNode() && (isCollection || ((Node)contextItem).hasNode(JcrConstants.JCR_CONTENT));
         } catch (RepositoryException e) {
             log.error("Unexpected error: " + e.getMessage());
             return false;