Skip to content

Commit c1b6e18

Browse files
committed
AtmosSource: fixed error when using namespace root
1 parent 24d95dc commit c1b6e18

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

src/main/java/com/emc/vipr/sync/source/AtmosSource.java

+16-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
import com.emc.atmos.AtmosException;
1818
import com.emc.atmos.api.*;
19-
import com.emc.atmos.api.bean.*;
19+
import com.emc.atmos.api.bean.DirectoryEntry;
20+
import com.emc.atmos.api.bean.Metadata;
21+
import com.emc.atmos.api.bean.ServiceInformation;
2022
import com.emc.atmos.api.jersey.AtmosApiClient;
2123
import com.emc.atmos.api.request.ListDirectoryRequest;
2224
import com.emc.vipr.sync.filter.SyncFilter;
@@ -211,17 +213,19 @@ public void configure(SyncSource source, Iterator<SyncFilter> filters, SyncTarge
211213

212214
if (namespace) {
213215
if (!namespaceRoot.startsWith("/")) namespaceRoot = "/" + namespaceRoot;
214-
namespaceRoot = namespaceRoot.replaceFirst("/$", "");
215-
216-
// does namespaceRoot exist?
217-
try {
218-
Metadata typeMeta = atmos.getSystemMetadata(new ObjectPath(namespaceRoot)).get(AtmosUtil.TYPE_KEY);
219-
if (AtmosUtil.DIRECTORY_TYPE.equals(typeMeta.getValue()))
220-
namespaceRoot += "/";
221-
} catch (AtmosException e) {
222-
if (e.getErrorCode() == 1003)
223-
throw new ConfigurationException("specified path does not exist in the cloud");
224-
throw e;
216+
if (!namespaceRoot.equals("/")) {
217+
namespaceRoot = namespaceRoot.replaceFirst("/$", "");
218+
219+
// does namespaceRoot exist?
220+
try {
221+
Metadata typeMeta = atmos.getSystemMetadata(new ObjectPath(namespaceRoot)).get(AtmosUtil.TYPE_KEY);
222+
if (AtmosUtil.DIRECTORY_TYPE.equals(typeMeta.getValue()))
223+
namespaceRoot += "/";
224+
} catch (AtmosException e) {
225+
if (e.getErrorCode() == 1003)
226+
throw new ConfigurationException("specified path does not exist in the cloud");
227+
throw e;
228+
}
225229
}
226230
}
227231
}

0 commit comments

Comments
 (0)