Author: markt
Date: Mon Sep 29 10:41:28 2014
New Revision: 1628156
URL: http://svn.apache.org/r1628156
Log:
Ensure that an attempt to call digest.[sh|bat] with no args triggers the usage
message
Modified:
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1628156&r1=1628155&r2=1628156&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Mon Sep 29
10:41:28 2014
@@ -1466,6 +1466,11 @@ public abstract class RealmBase extends
int keyLength = -1;
String handlerClassName = null;
+ if (args.length == 0) {
+ usage();
+ return;
+ }
+
int argIndex = 0;
while (args.length > argIndex + 2 && args[argIndex].length() == 2 &&
@@ -1496,9 +1501,7 @@ public abstract class RealmBase extends
break;
}
default: {
- System.out.println("Usage: RealmBase [-a <algorithm>] [-e
<encoding>] " +
- "[-i <iterations>] [-s <salt-length>] [-k
<key-length>] " +
- "[-h <handler-class-name>] <credentials>");
+ usage();
return;
}
}
@@ -1553,6 +1556,13 @@ public abstract class RealmBase extends
}
+ private static void usage() {
+ System.out.println("Usage: RealmBase [-a <algorithm>] [-e <encoding>]
" +
+ "[-i <iterations>] [-s <salt-length>] [-k <key-length>] " +
+ "[-h <handler-class-name>] <credentials>");
+ }
+
+
// -------------------- JMX and Registration --------------------
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
