Changeset 448

Timestamp:

06/03/09 17:17:13 (3 years ago)

Author:

octorian

Message:

Replaced StringBuffer usage in receive() with DataBuffer so that only a single String object is created on return. Added synchronization to some methods just-in-case.

File:

• branches/LogicMail-1.1/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java (modified) (11 diffs)

branches/LogicMail-1.1/LogicMail/src/org/logicprobe/LogicMail/util/Connection.java

@@ -70 +70 @@
 import net.rim.device.api.ui.UiApplication;
 import net.rim.device.api.ui.component.Dialog;
+import net.rim.device.api.util.DataBuffer;
+
 import org.logicprobe.LogicMail.AppInfo;
 import org.logicprobe.LogicMail.conf.GlobalConfig;
@@ -113 +115 @@
      */
     private byte[] buffer = new byte[128];
-    
+
+    /**
+     * Provides a dynamic buffer for building results
+     */
+    DataBuffer resultBuffer = new DataBuffer();
+
     /**
      * Holds the actual number of bytes in the buffer.
@@ -138 +145 @@
      * Opens a connection.
      */
-    public void open() throws IOException {
+    public synchronized void open() throws IOException {
         if(input != null || output != null || socket != null) {
             close();
@@ -194 +201 @@
      * Closes a connection.
      */
-    public void close() throws IOException {
+    public synchronized void close() throws IOException {
         try {
             if(input != null) {
@@ -293 +300 @@
      * @see #receive
      */
-    public void send(String s) throws IOException {
+    public synchronized void send(String s) throws IOException {
         byte[] bytes = s.getBytes();
         int length = bytes.length;
@@ -350 +357 @@
      * is a prepared protocol command.
      */
-    public void sendCommand(String s) throws IOException {
+    public synchronized void sendCommand(String s) throws IOException {
         if(globalConfig.getConnDebug()) {
             EventLogger.logEvent(AppInfo.GUID, ("[SEND CMD] " + s).getBytes(), EventLogger.DEBUG_INFO);
@@ -372 +379 @@
      * @see #send
      */
-    public void sendRaw(String s) throws IOException {
+    public synchronized void sendRaw(String s) throws IOException {
         byte[] bytes = s.getBytes();
         
@@ -393 +400 @@
      * @see #send
      */
-    public String receive() throws IOException {
+    public synchronized String receive() throws IOException {
         /**
          * A note on how this method works and why it is designed the
@@ -421 +428 @@
          * but there's not much one can about that.
          */
-        StringBuffer resultBuffer = new StringBuffer();
         boolean stop = false;
+        resultBuffer.reset();
         
         /**
@@ -470 +477 @@
                  */
                 // Note: We really should look for CRLF, and not use this
-                // half-assed approach which screws up on mid-lime LFs. (DK)
+                // half-assed approach which screws up on mid-line LFs. (DK)
                 else {
                     byte b = buffer[count];
@@ -498 +505 @@
                 }
             }
-            resultBuffer.append(new String(buffer, 0, count));
-        }
+            resultBuffer.write(buffer, 0, count);
+        }
+        
+        String result = new String(resultBuffer.toArray());
         
         if(globalConfig.getConnDebug()) {
-            EventLogger.logEvent(AppInfo.GUID, ("[RECV] " + resultBuffer.toString()).getBytes(), EventLogger.DEBUG_INFO);
-        }
-        
-        return resultBuffer.toString();
+            EventLogger.logEvent(AppInfo.GUID, ("[RECV] " + result).getBytes(), EventLogger.DEBUG_INFO);
+        }
+        
+        return result;
     }
 }