You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/26 19:36:44 UTC
svn commit: r1461260 - in /accumulo/trunk: ./ assemble/ core/
core/src/main/java/org/apache/accumulo/core/cli/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/
test/src/test/java...
Author: ecn
Date: Tue Mar 26 18:36:44 2013
New Revision: 1461260
URL: http://svn.apache.org/r1461260
Log:
ACCUMULO-1210 remove stray println
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1461247,1461259
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1461247,1461259
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1461247,1461259
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1461260&r1=1461259&r2=1461260&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Tue Mar 26 18:36:44 2013
@@ -123,7 +123,6 @@ public class ClientOpts extends Help {
props.put(loginOption.getKey(), loginOption.getValue());
try {
- System.out.println(props);
return getInstance().getAuthenticator().login(props);
} catch (AccumuloSecurityException e) {
throw new RuntimeException(e);
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1461247,1461259
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1461247,1461259
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1461247,1461259
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1461247,1461259
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1461247,1461259
Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1461260&r1=1461259&r2=1461260&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Tue Mar 26 18:36:44 2013
@@ -165,12 +165,13 @@ public class ShellServerTest {
Constructor<DistCp>[] constructors = (Constructor<DistCp>[]) DistCp.class.getConstructors();
for (Constructor<DistCp> constructor : constructors) {
Class<?>[] parameterTypes = constructor.getParameterTypes();
- if (parameterTypes.length > 1 && parameterTypes[0].equals(Configuration.class))
+ if (parameterTypes.length > 0 && parameterTypes[0].equals(Configuration.class)) {
if (parameterTypes.length == 1) {
return constructor.newInstance(new Configuration());
} else if (parameterTypes.length == 2) {
return constructor.newInstance(new Configuration(), null);
}
+ }
}
} catch (Exception e) {
throw new RuntimeException(e);