You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by du...@apache.org on 2001/02/06 17:16:03 UTC
cvs commit: xml-axis/java/src/org/apache/axis/utils Debug.java
dug 01/02/06 08:16:02
Modified: java/src/org/apache/axis/handlers HTTPDispatchHandler.java
java/src/org/apache/axis/server/transports AxisServlet.java
java/src/org/apache/axis/utils Debug.java
Log:
Minor updates - passwd wasn't being passed correctly.
Revision Changes Path
1.6 +2 -1 xml-axis/java/src/org/apache/axis/handlers/HTTPDispatchHandler.java
Index: HTTPDispatchHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/HTTPDispatchHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HTTPDispatchHandler.java 2001/02/05 22:30:10 1.5
+++ HTTPDispatchHandler.java 2001/02/06 16:15:55 1.6
@@ -117,7 +117,8 @@
if ( userID != null )
otherHeaders = Constants.HEADER_AUTHORIZATION + ": Basic " +
- Base64.encode( (userID + ":" + passwd).getBytes() ) +
+ Base64.encode( (userID + ":" +
+ ((passwd == null) ? "" : passwd) ).getBytes() ) +
"\n" ;
String header = Constants.HEADER_POST + " " +
1.13 +6 -2 xml-axis/java/src/org/apache/axis/server/transports/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/transports/AxisServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AxisServlet.java 2001/02/05 22:30:10 1.12
+++ AxisServlet.java 2001/02/06 16:15:58 1.13
@@ -139,8 +139,12 @@
if ( i == -1 ) user = tmp ;
else user = tmp.substring( 0, i);
msgContext.setProperty( Constants.MC_USERID, user );
- if ( i != -1 )
- msgContext.setProperty( Constants.MC_PASSWORD, tmp.substring(i+1) );
+ if ( i != -1 ) {
+ String pwd = tmp.substring(i+1);
+ if ( pwd != null && pwd.equals("") ) pwd = null ;
+ if ( pwd != null )
+ msgContext.setProperty( Constants.MC_PASSWORD, pwd );
+ }
}
// Invoke the Axis engine...
1.2 +1 -1 xml-axis/java/src/org/apache/axis/utils/Debug.java
Index: Debug.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Debug.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Debug.java 2001/02/01 22:21:34 1.1
+++ Debug.java 2001/02/06 16:16:01 1.2
@@ -105,7 +105,7 @@
public static void Print( int level, Exception exp ) {
if ( debugLevel < level ) return ;
try {
- String msg = "Exception: " + exp.getMessage() ;
+ String msg = "Exception: " + exp ;
if ( toScreen )
System.err.println( msg );
if ( toFile ) {