Merge pull request OfficeDev#243 from vbauer/message-format

serious6 · serious6 · commit c60942a8a4e0 · 2015-03-09T16:40:12.000+01:00
- fix message concatenation
diff --git a/src/main/java/microsoft/exchange/webservices/data/ExchangeServiceBase.java b/src/main/java/microsoft/exchange/webservices/data/ExchangeServiceBase.java
@@ -38,6 +38,7 @@
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
@@ -49,11 +50,14 @@
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.TimeZone;
 
 /**
  * Represents an abstract binding to an Exchange Service.
@@ -324,11 +328,9 @@ protected void internalProcessHttpErrorResponse(HttpWebRequest httpWebResponse,
         accountUnlockUrl = new URI(location);
       }
 
-      this.traceMessage(responseTraceFlag,
-          String.format("Account is locked. Unlock URL is {0}", accountUnlockUrl));
-
-      throw new AccountIsLockedException(String.format(Strings.AccountIsLocked, accountUnlockUrl),
-          accountUnlockUrl, webException);
+      final String message = String.format(Strings.AccountIsLocked, accountUnlockUrl);
+      this.traceMessage(responseTraceFlag, message);
+      throw new AccountIsLockedException(message, accountUnlockUrl, webException);
     }
   }
 
diff --git a/src/main/java/microsoft/exchange/webservices/data/MapiTypeConverterMapEntry.java b/src/main/java/microsoft/exchange/webservices/data/MapiTypeConverterMapEntry.java
@@ -96,7 +96,7 @@ protected MapiTypeConverterMapEntry(Class<?> type) {
     EwsUtilities.EwsAssert(
         defaultValueMap.getMember().containsKey(type),
         "MapiTypeConverterMapEntry ctor",
-        String.format("No default value entry for type {0}", type.getName()));
+        "No default value entry for type " + type.getName());
 
     this.type = type;
     this.convertToString = new IFunction<Object, String>() {
