Author: rombert
Date: Thu Sep 19 11:13:02 2013
New Revision: 1524695
URL: http://svn.apache.org/r1524695
Log:
SLING-2989 - [Tooling] integrate with vlt once available
Fix NPE if the META-INF/vault/ directory exists by not config.xml.
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java?rev=1524695&r1=1524694&r2=1524695&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/VaultFsLocatorImpl.java
Thu Sep 19 11:13:02 2013
@@ -54,7 +54,9 @@ public class VaultFsLocatorImpl implemen
if (vaultDir.isDirectory()) {
File configFile = new File(vaultDir, Constants.CONFIG_XML);
- config = AbstractVaultFsConfig.load(configFile);
+ if (configFile.exists()) {
+ config = AbstractVaultFsConfig.load(configFile);
+ }
}
}