You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2014/05/20 19:22:38 UTC
svn commit: r1596327 -
/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Author: stefanegli
Date: Tue May 20 17:22:38 2014
New Revision: 1596327
URL: http://svn.apache.org/r1596327
Log:
SLING-3589 : added a null check for the filter.xml and falling back to allow-everything .. but we should probably review and, as Konrad suggested, auto-create a filter.xml
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1596327&r1=1596326&r2=1596327&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java Tue May 20 17:22:38 2014
@@ -940,8 +940,13 @@ public class JcrNode implements IAdaptab
// if (repositoryInfo==null) {
// return false;
// }
- final FilterResult result = filter.filter(ProjectUtil.getSyncDirectoryFile(project), relativeFilePath, null);
- return result==FilterResult.ALLOW;
+ if (filter==null) {
+ Activator.getDefault().getPluginLogger().error("No filter.xml found for "+project);
+ return true;
+ } else {
+ final FilterResult result = filter.filter(ProjectUtil.getSyncDirectoryFile(project), relativeFilePath, null);
+ return result==FilterResult.ALLOW;
+ }
} catch (CoreException e) {
PluginLogger logger = Activator.getDefault().getPluginLogger();
logger.error("Could not verify child node allowance: "+this, e);