formatting

Author: freynaud

server/src/main/java/org/uiautomation/ios/mobileSafari/DefaultMessageHandler.java

@@ -71,10 +71,10 @@ private void process(String rawMessage) {
         responses.add(message);
         return;
       }
+
       // not null, not a command response.
       // should be an event.
       Event e = EventFactory.createEvent(message);
-
       if (isPageLoad(message)) {
         listener.onPageLoad();
         return;
@@ -106,7 +106,7 @@ private boolean isImportantDOMChange(Event e) {
 
   private boolean isPageLoad(JSONObject message) {
     String method = message.optString("method");
-    return "Page.loadEventFired".equals(method);
+    return "Page.loadEventFired".equals(method); //  || "Profiler.resetProfiles".equals(method);
     // return "Profiler.resetProfiles".equals(method) ||
     // "DOM.documentUpdated".equals(method);
   }

server/src/main/java/org/uiautomation/ios/mobileSafari/PlistManager.java

@@ -41,7 +41,9 @@ public static String loadFromTemplate(String templatePath) {
       return cacheTemplate;
     }
 
-    InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(templatePath);
+    InputStream
+        is =
+        Thread.currentThread().getContextClassLoader().getResourceAsStream(templatePath);
     if (is == null) {
       throw new WebDriverException("cannot load : " + templatePath);
     }
@@ -55,8 +57,7 @@ public static String loadFromTemplate(String templatePath) {
     return content;
   }
 
-  
-  
+
   public String JSONCommand(JSONObject command) throws IOException {
     String json = command.toString();
     String s = Base64.encodeBase64String(json.getBytes());
@@ -72,7 +73,11 @@ public byte[] plistXmlToBinary(String msg) throws Exception {
   }
 
   public String plistBinaryToXml(byte[] binary) throws Exception {
-    NSObject object = BinaryPropertyListParser.parse(binary);
-    return object.toXMLPropertyList();
+    try {
+      NSObject object = BinaryPropertyListParser.parse(binary);
+      return object.toXMLPropertyList();
+    } catch (Exception e) {
+      return null;
+    }
   }
 }