Author: olamy
Date: Wed Nov 2 22:29:46 2011
New Revision: 1196835
URL: http://svn.apache.org/viewvc?rev=1196835&view=rev
Log:
do not index directory in case of group: prevent NPE
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1196835&r1=1196834&r2=1196835&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Wed Nov 2 22:29:46 2011
@@ -951,12 +951,15 @@ public class ArchivaDavResourceFactory
{
// in case of group displaying index directory doesn't
have sense !!
String repoIndexDirectory =
managedRepository.getRepository().getIndexDirectory();
- if ( !new File( repoIndexDirectory ).isAbsolute() )
+ if ( StringUtils.isNotEmpty( repoIndexDirectory ) )
{
- repoIndexDirectory = new File(
managedRepository.getRepository().getLocation(),
- StringUtils.isEmpty(
repoIndexDirectory )
- ? ".indexer"
- :
repoIndexDirectory ).getAbsolutePath();
+ if ( !new File( repoIndexDirectory ).isAbsolute() )
+ {
+ repoIndexDirectory = new File(
managedRepository.getRepository().getLocation(),
+
StringUtils.isEmpty( repoIndexDirectory )
+ ? ".indexer"
+ :
repoIndexDirectory ).getAbsolutePath();
+ }
}
if ( StringUtils.isEmpty( repoIndexDirectory ) )
{
