Author: andy
Date: Wed Oct 16 13:59:21 2013
New Revision: 1532768
URL: http://svn.apache.org/r1532768
Log:
Revert changes
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java?rev=1532768&r1=1532767&r2=1532768&view=diff
==============================================================================
---
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
(original)
+++
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
Wed Oct 16 13:59:21 2013
@@ -125,18 +125,12 @@ public class Location {
public Location getSubLocation(String dirname) {
String newName = pathname + dirname ;
- if ( isMem() ) {
- if ( isMemUnique )
- return mem() ;
- else
- return mem(newName) ;
- }
-
File file = new File(newName) ;
if ( file.exists() && !file.isDirectory() )
throw new FileException("Existing file: " +
file.getAbsolutePath()) ;
if ( !file.exists() )
file.mkdir() ;
+
return new Location(newName) ;
}
@@ -166,8 +160,6 @@ public class Location {
/** Does the location exist (and it a directory, and is accessible) */
public boolean exists() {
- if ( isMem() )
- return true ;
File f = new File(getDirectoryPath()) ;
return f.exists() && f.isDirectory() && f.canRead() ;
}
@@ -177,8 +169,6 @@ public class Location {
}
public boolean exists(String filename, String ext) {
- if ( isMem() )
- return true ;
String fn = getPath(filename, ext) ;
File f = new File(fn) ;
return f.exists() ;