You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2014/02/04 00:40:35 UTC
[1/5] git commit: ACCUMULO-2316 No more namespacenotfound for table
requests
Updated Branches:
refs/heads/master e9fe02266 -> 3fd5fa967
ACCUMULO-2316 No more namespacenotfound for table requests
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98e374b0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98e374b0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98e374b0
Branch: refs/heads/master
Commit: 98e374b0ea342136d4ef68cd3a266653ea07de11
Parents: 17324b9
Author: John Vines <vi...@apache.org>
Authored: Mon Feb 3 18:03:55 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Feb 3 18:04:46 2014 -0500
----------------------------------------------------------------------
.../client/admin/SecurityOperationsImpl.java | 4 ++++
.../server/client/ClientServiceHandler.java | 19 +++++++++++--------
.../accumulo/master/FateServiceHandler.java | 12 ++++++------
.../master/MasterClientServiceHandler.java | 4 ++--
.../org/apache/accumulo/test/NamespacesIT.java | 12 ++----------
5 files changed, 25 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98e374b0/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
index ebd79ad..17feb9b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
@@ -53,6 +53,8 @@ public class SecurityOperationsImpl implements SecurityOperations {
// recast missing table
if (ttoe.getType() == TableOperationExceptionType.NOTFOUND)
throw new AccumuloSecurityException(null, SecurityErrorCode.TABLE_DOESNT_EXIST);
+ else if (ttoe.getType() == TableOperationExceptionType.NAMESPACE_NOTFOUND)
+ throw new AccumuloSecurityException(null, SecurityErrorCode.NAMESPACE_DOESNT_EXIST);
else
throw new AccumuloException(ttoe);
} catch (ThriftSecurityException e) {
@@ -71,6 +73,8 @@ public class SecurityOperationsImpl implements SecurityOperations {
// recast missing table
if (ttoe.getType() == TableOperationExceptionType.NOTFOUND)
throw new AccumuloSecurityException(null, SecurityErrorCode.TABLE_DOESNT_EXIST);
+ else if (ttoe.getType() == TableOperationExceptionType.NAMESPACE_NOTFOUND)
+ throw new AccumuloSecurityException(null, SecurityErrorCode.NAMESPACE_DOESNT_EXIST);
else
throw new AccumuloException(ttoe);
} catch (ThriftSecurityException e) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98e374b0/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index 3571d7f..d62ccc1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -80,12 +80,15 @@ public class ClientServiceHandler implements ClientService.Iface {
this.fs = fs;
}
- public static String checkTableId(Instance instance, String tableName, TableOperation operation) throws ThriftTableOperationException {
+ public static String checkTableId(Instance instance, String tableName, TableOperation operation, boolean allowNamespaceNotFound) throws ThriftTableOperationException {
TableOperationExceptionType reason = null;
try {
return Tables._getTableId(instance, tableName);
} catch (NamespaceNotFoundException e) {
- reason = TableOperationExceptionType.NAMESPACE_NOTFOUND;
+ if (allowNamespaceNotFound)
+ reason = TableOperationExceptionType.NAMESPACE_NOTFOUND;
+ else
+ reason = TableOperationExceptionType.NOTFOUND;
} catch (TableNotFoundException e) {
reason = TableOperationExceptionType.NOTFOUND;
}
@@ -182,7 +185,7 @@ public class ClientServiceHandler implements ClientService.Iface {
@Override
public void grantTablePermission(TInfo tinfo, TCredentials credentials, String user, String tableName, byte permission) throws ThriftSecurityException,
ThriftTableOperationException {
- String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION);
+ String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION, false);
String namespaceId = Tables.getNamespaceId(instance, tableId);
security.grantTablePermission(credentials, user, tableId, TablePermission.getPermissionById(permission), namespaceId);
@@ -203,7 +206,7 @@ public class ClientServiceHandler implements ClientService.Iface {
@Override
public void revokeTablePermission(TInfo tinfo, TCredentials credentials, String user, String tableName, byte permission) throws ThriftSecurityException,
ThriftTableOperationException {
- String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION);
+ String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION, false);
String namespaceId = Tables.getNamespaceId(instance, tableId);
security.revokeTablePermission(credentials, user, tableId, TablePermission.getPermissionById(permission), namespaceId);
@@ -217,7 +220,7 @@ public class ClientServiceHandler implements ClientService.Iface {
@Override
public boolean hasTablePermission(TInfo tinfo, TCredentials credentials, String user, String tableName, byte tblPerm) throws ThriftSecurityException,
ThriftTableOperationException {
- String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION);
+ String tableId = checkTableId(instance, tableName, TableOperation.PERMISSION, false);
return security.hasTablePermission(credentials, user, tableId, TablePermission.getPermissionById(tblPerm));
}
@@ -268,7 +271,7 @@ public class ClientServiceHandler implements ClientService.Iface {
@Override
public Map<String,String> getTableConfiguration(TInfo tinfo, TCredentials credentials, String tableName) throws TException, ThriftTableOperationException {
- String tableId = checkTableId(instance, tableName, null);
+ String tableId = checkTableId(instance, tableName, null, true);
AccumuloConfiguration config = ServerConfiguration.getTableConfiguration(instance, tableId);
return conf(credentials, config);
}
@@ -331,7 +334,7 @@ public class ClientServiceHandler implements ClientService.Iface {
security.authenticateUser(credentials, credentials);
- String tableId = checkTableId(instance, tableName, null);
+ String tableId = checkTableId(instance, tableName, null, true);
ClassLoader loader = getClass().getClassLoader();
Class<?> shouldMatch;
@@ -403,7 +406,7 @@ public class ClientServiceHandler implements ClientService.Iface {
for (String table : tables) {
// ensure that table table exists
- String tableId = checkTableId(instance, table, null);
+ String tableId = checkTableId(instance, table, null, true);
tableIds.add(tableId);
String namespaceId = Tables.getNamespaceId(instance, tableId);
if (!security.canScan(credentials, tableId, namespaceId))
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98e374b0/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index 555e3e4..7e274c0 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@ -160,7 +160,7 @@ class FateServiceHandler implements FateService.Iface {
});
- String tableId = ClientServiceHandler.checkTableId(master.getInstance(), oldTableName, tableOp);
+ String tableId = ClientServiceHandler.checkTableId(master.getInstance(), oldTableName, tableOp, true);
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
if (!master.security.canRenameTable(c, tableId, oldTableName, newTableName, namespaceId))
@@ -215,7 +215,7 @@ class FateServiceHandler implements FateService.Iface {
TableOperation tableOp = TableOperation.DELETE;
String tableName = validateTableNameArgument(arguments.get(0), tableOp, Tables.NOT_SYSTEM);
- final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
+ final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp, true);
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
if (!master.security.canDeleteTable(c, tableId, namespaceId))
@@ -251,7 +251,7 @@ class FateServiceHandler implements FateService.Iface {
Text startRow = ByteBufferUtil.toText(arguments.get(1));
Text endRow = ByteBufferUtil.toText(arguments.get(2));
- final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
+ final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp, true);
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
if (!master.security.canMerge(c, tableId, namespaceId))
@@ -267,7 +267,7 @@ class FateServiceHandler implements FateService.Iface {
Text startRow = ByteBufferUtil.toText(arguments.get(1));
Text endRow = ByteBufferUtil.toText(arguments.get(2));
- final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
+ final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp, true);
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
if (!master.security.canDeleteRange(c, tableId, tableName, startRow, endRow, namespaceId))
@@ -283,7 +283,7 @@ class FateServiceHandler implements FateService.Iface {
String failDir = ByteBufferUtil.toString(arguments.get(2));
boolean setTime = Boolean.parseBoolean(ByteBufferUtil.toString(arguments.get(3)));
- final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
+ final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp, true);
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
if (!master.security.canBulkImport(c, tableId, tableName, dir, failDir, namespaceId))
@@ -339,7 +339,7 @@ class FateServiceHandler implements FateService.Iface {
String tableName = validateTableNameArgument(arguments.get(0), tableOp, Tables.NOT_SYSTEM);
String exportDir = ByteBufferUtil.toString(arguments.get(1));
- String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp);
+ String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, tableOp, true);
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
if (!master.security.canExport(c, tableId, tableName, exportDir, namespaceId))
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98e374b0/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
index 8023169..847cd80 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -434,7 +434,7 @@ class MasterClientServiceHandler extends FateServiceHandler implements MasterCli
private void alterTableProperty(TCredentials c, String tableName, String property, String value, TableOperation op) throws ThriftSecurityException,
ThriftTableOperationException {
- final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, op);
+ final String tableId = ClientServiceHandler.checkTableId(master.getInstance(), tableName, op, false);
String namespaceId = Tables.getNamespaceId(master.getInstance(), tableId);
if (!master.security.canAlterTable(c, tableId, namespaceId))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
@@ -447,7 +447,7 @@ class MasterClientServiceHandler extends FateServiceHandler implements MasterCli
}
} catch (KeeperException.NoNodeException e) {
// race condition... table no longer exists? This call will throw an exception if the table was deleted:
- ClientServiceHandler.checkTableId(master.getInstance(), tableName, op);
+ ClientServiceHandler.checkTableId(master.getInstance(), tableName, op, true);
log.info("Error altering table property", e);
throw new ThriftTableOperationException(tableId, tableName, op, TableOperationExceptionType.OTHER, "Problem altering table property");
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98e374b0/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
index 6915c96..3ea16c5 100644
--- a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java
@@ -528,13 +528,6 @@ public class NamespacesIT extends SimpleMacIT {
assertFalse(c.tableOperations().exists(t2));
assertTrue(c.tableOperations().exists(t3));
assertFalse(c.tableOperations().exists(t4));
-
- // unqualified rename
- c.tableOperations().rename(t3, Tables.qualify(t4).getSecond());
- assertFalse(c.tableOperations().exists(t1));
- assertFalse(c.tableOperations().exists(t2));
- assertFalse(c.tableOperations().exists(t3));
- assertTrue(c.tableOperations().exists(t4));
}
/**
@@ -871,8 +864,7 @@ public class NamespacesIT extends SimpleMacIT {
}
} catch (Exception e) {
numRun++;
- if (!(e instanceof AccumuloException) || !(e.getCause() instanceof TableNotFoundException)
- || !(e.getCause().getCause() instanceof NamespaceNotFoundException))
+ if (!(e instanceof TableNotFoundException || (e instanceof AccumuloException && e.getCause() instanceof TableNotFoundException)))
throw new Exception("Case " + i + " resulted in " + e.getClass().getName(), e);
}
@@ -976,7 +968,7 @@ public class NamespacesIT extends SimpleMacIT {
}
} catch (Exception e) {
numRun++;
- if (!(e instanceof TableNotFoundException) || !(e.getCause() instanceof NamespaceNotFoundException))
+ if (!(e instanceof TableNotFoundException) && !(e.getCause() instanceof NamespaceNotFoundException))
throw new Exception("Case " + i + " resulted in " + e.getClass().getName(), e);
}
}
[4/5] git commit: ACCUMULO-2312 NPE fixed by 2316/2318,
but making message better
Posted by vi...@apache.org.
ACCUMULO-2312 NPE fixed by 2316/2318, but making message better
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b33fbf40
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b33fbf40
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b33fbf40
Branch: refs/heads/master
Commit: b33fbf40d0b16ee59d74341e568fab4abb160017
Parents: 1d411fb
Author: John Vines <vi...@apache.org>
Authored: Mon Feb 3 18:38:32 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Feb 3 18:38:32 2014 -0500
----------------------------------------------------------------------
.../accumulo/test/randomwalk/concurrent/ChangePermissions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b33fbf40/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
index 63af95a..73e6175 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
@@ -68,7 +68,7 @@ public class ChangePermissions extends Test {
if (cause != null && cause instanceof ThriftTableOperationException) {
ThriftTableOperationException toe = (ThriftTableOperationException)cause.getCause();
if (toe.type == TableOperationExceptionType.NAMESPACE_NOTFOUND) {
- log.debug("Unable to change user permissions: " + toe.getCause());
+ log.debug("Unable to change user permissions: " + toe);
return;
}
}
[2/5] git commit: ACCUMULO-2318 making rename's second argument
require a namespace
Posted by vi...@apache.org.
ACCUMULO-2318 making rename's second argument require a namespace
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17324b9d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17324b9d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17324b9d
Branch: refs/heads/master
Commit: 17324b9d00c30b2e1e31d9dfe5aaae369e832873
Parents: 5117947
Author: John Vines <vi...@apache.org>
Authored: Mon Feb 3 17:08:06 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Feb 3 18:04:46 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/master/FateServiceHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/17324b9d/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
index f3428a6..555e3e4 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
@@ -150,7 +150,7 @@ class FateServiceHandler implements FateService.Iface {
public boolean isValid(String argument) {
// verify they are in the same namespace
String oldNamespace = Tables.qualify(oldTableName).getFirst();
- return oldNamespace.equals(Tables.qualify(argument, oldNamespace).getFirst());
+ return oldNamespace.equals(Tables.qualify(argument).getFirst());
}
@Override
[5/5] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Posted by vi...@apache.org.
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fd5fa96
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fd5fa96
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fd5fa96
Branch: refs/heads/master
Commit: 3fd5fa9673bfddb83ac3328728fa0ba666bcbfa9
Parents: e9fe022 b33fbf4
Author: John Vines <vi...@apache.org>
Authored: Mon Feb 3 18:40:32 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Feb 3 18:40:32 2014 -0500
----------------------------------------------------------------------
.../core/client/ClientConfiguration.java | 25 ++++++--------------
.../client/admin/SecurityOperationsImpl.java | 4 ++++
.../server/client/ClientServiceHandler.java | 19 ++++++++-------
.../accumulo/master/FateServiceHandler.java | 14 +++++------
.../master/MasterClientServiceHandler.java | 4 ++--
.../concurrent/ChangePermissions.java | 2 +-
.../org/apache/accumulo/test/NamespacesIT.java | 12 ++--------
7 files changed, 34 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
[3/5] git commit: ACCUMULO-2317 banishing loadDefault(String) and
providing adequate documentation to the constructor
Posted by vi...@apache.org.
ACCUMULO-2317 banishing loadDefault(String) and providing adequate documentation to the constructor
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1d411fbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1d411fbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1d411fbe
Branch: refs/heads/master
Commit: 1d411fbe829cd72d9c7d888c829c545e4da8cb16
Parents: 98e374b
Author: John Vines <vi...@apache.org>
Authored: Mon Feb 3 18:34:23 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Mon Feb 3 18:34:23 2014 -0500
----------------------------------------------------------------------
.../core/client/ClientConfiguration.java | 25 ++++++--------------
1 file changed, 7 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1d411fbe/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 26974e2..a3d51cf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.accumulo.core.client;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.Arrays;
@@ -109,6 +108,13 @@ public class ClientConfiguration extends CompositeConfiguration {
super(configs);
}
+ /**
+ * Iterates through the Configuration objects, populating this object.
+ *
+ * @see PropertiesConfiguration
+ * @see #loadDefault()
+ */
+
public ClientConfiguration(Configuration... configs) {
this(Arrays.asList(configs));
}
@@ -128,23 +134,6 @@ public class ClientConfiguration extends CompositeConfiguration {
return loadFromSearchPath(getDefaultSearchPath());
}
- /**
- * Attempts to load the overridePropertiesFilename as a configuration file using PropertiesConfiguration. Uses {@link #loadDefault()} if argument is null
- *
- * @throws FileNotFoundException
- * Cannot find overridePropertiesFilename
- * @throws ConfigurationException
- * Error while loading the properties file
- * @see PropertiesConfiguration
- * @see #loadDefault()
- */
- public static ClientConfiguration loadDefault(String overridePropertiesFilename) throws FileNotFoundException, ConfigurationException {
- if (overridePropertiesFilename == null)
- return loadDefault();
- else
- return new ClientConfiguration(new PropertiesConfiguration(overridePropertiesFilename));
- }
-
private static ClientConfiguration loadFromSearchPath(List<String> paths) {
try {
List<Configuration> configs = new LinkedList<Configuration>();