You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2008/12/01 10:05:39 UTC

svn commit: r722002 - /servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java

Author: lhein
Date: Mon Dec  1 01:05:39 2008
New Revision: 722002

URL: http://svn.apache.org/viewvc?rev=722002&view=rev
Log:
applied patch for SM-1700 on behalf of Darren Davison

Modified:
    servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java

Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java?rev=722002&r1=722001&r2=722002&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java Mon Dec  1 01:05:39 2008
@@ -139,7 +139,7 @@
             config.setFolderName("INBOX");
         }
 
-        if (uri.getQuery().indexOf("password=") != -1) {
+        if (uri.getQuery() != null && uri.getQuery().indexOf("password=") != -1) {
             // extract the password from query
             int beginIndex = uri.getQuery().indexOf("password=") + "password=".length();
             int endIndex = uri.getQuery().indexOf(';', beginIndex + 1) != -1 ? uri.getQuery()
@@ -152,7 +152,7 @@
 
         if (userInfo == null) {
             // alternative way of specifying the user name
-            if (uri.getQuery().indexOf("user=") != -1) {
+            if (uri.getQuery() != null && uri.getQuery().indexOf("user=") != -1) {
                 // extract the password from query
                 int beginIndex = uri.getQuery().indexOf("user=") + "user=".length();
                 int endIndex = uri.getQuery().indexOf(';', beginIndex + 1) != -1 ? uri.getQuery()