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 2017/04/03 18:16:06 UTC
svn commit: r1790029 - in
/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl:
helper/SlingFileUploadHandler.java operations/JCRSupport.java
operations/JCRSupportImpl.java
Author: cziegeler
Date: Mon Apr 3 18:16:06 2017
New Revision: 1790029
URL: http://svn.apache.org/viewvc?rev=1790029&view=rev
Log:
SLING-6723 : Make dependency to javax.jcr, jcr.contentloader and jcr.api optional
Modified:
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingFileUploadHandler.java
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupport.java
sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupportImpl.java
Modified: sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingFileUploadHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingFileUploadHandler.java?rev=1790029&r1=1790028&r2=1790029&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingFileUploadHandler.java (original)
+++ sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/helper/SlingFileUploadHandler.java Mon Apr 3 18:16:06 2017
@@ -127,10 +127,13 @@ public class SlingFileUploadHandler {
boolean createNtFile = parentResource.isResourceType(JcrConstants.NT_FOLDER) || this.jcrSupport.isNodeType(parentResource, JcrConstants.NT_FOLDER);
String typeHint = prop.getTypeHint();
if (typeHint != null) {
- createNtFile = this.jcrSupport.isFileNodeType(parentResource.getResourceResolver(), typeHint);
- if ( !createNtFile ) {
+ Boolean isFileNodeType = this.jcrSupport.isFileNodeType(parentResource.getResourceResolver(), typeHint);
+ if ( isFileNodeType == null ) {
// assuming type not valid.
+ createNtFile = false;
typeHint = null;
+ } else {
+ createNtFile = isFileNodeType;
}
}
Modified: sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupport.java?rev=1790029&r1=1790028&r2=1790029&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupport.java (original)
+++ sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupport.java Mon Apr 3 18:16:06 2017
@@ -88,7 +88,7 @@ public class JCRSupport {
return false;
}
- public boolean isFileNodeType(final ResourceResolver resolver, final String nodeType) {
+ public Boolean isFileNodeType(final ResourceResolver resolver, final String nodeType) {
if ( supportImpl != null ) {
return ((JCRSupportImpl)supportImpl).isFileNodeType(resolver, nodeType);
}
Modified: sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupportImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupportImpl.java?rev=1790029&r1=1790028&r2=1790029&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupportImpl.java (original)
+++ sling/trunk/bundles/servlets/post/src/main/java/org/apache/sling/servlets/post/impl/operations/JCRSupportImpl.java Mon Apr 3 18:16:06 2017
@@ -219,7 +219,7 @@ public class JCRSupportImpl {
return false;
}
- public boolean isFileNodeType(final ResourceResolver resolver, final String nodeType) {
+ public Boolean isFileNodeType(final ResourceResolver resolver, final String nodeType) {
final Session session = resolver.adaptTo(Session.class);
if ( session != null ) {
try {
@@ -228,6 +228,7 @@ public class JCRSupportImpl {
return nt.isNodeType(JcrConstants.NT_FILE);
} catch (RepositoryException e) {
// assuming type not valid.
+ return null;
}
}
return false;