From 8f8502f6e0d2a00fb522e4cc37801de2233d2b21 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Mon, 27 Dec 2010 11:33:34 +0100
Subject: [PATCH] fixed SerializeHelper include and delete

---
 pvDataApp/misc/serializeHelper.cpp | 9 ++++++---
 pvDataApp/misc/serializeHelper.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pvDataApp/misc/serializeHelper.cpp b/pvDataApp/misc/serializeHelper.cpp
index 549432d..566620a 100644
--- a/pvDataApp/misc/serializeHelper.cpp
+++ b/pvDataApp/misc/serializeHelper.cpp
@@ -91,7 +91,10 @@ namespace epics {
                     break;
             }
         }
+        
+        static String emptyString;
 
+        // TODO consider by reference !!!
         String SerializeHelper::deserializeString(ByteBuffer* buffer,
                 DeserializableControl* control) {
 
@@ -110,15 +113,15 @@ namespace epics {
                             break;
                     }
                     String s = String(retBuffer, size);
-                    delete retBuffer;
+                    delete[] retBuffer;
                     return s;
                 } catch(...) {
-                    delete retBuffer; // remove the buffer
+                    delete[] retBuffer; // remove the buffer
                     throw;
                 }
             }
             else
-                return String("");
+                return emptyString;
         }
 
     }
diff --git a/pvDataApp/misc/serializeHelper.h b/pvDataApp/misc/serializeHelper.h
index 8ce9605..c1e5a58 100644
--- a/pvDataApp/misc/serializeHelper.h
+++ b/pvDataApp/misc/serializeHelper.h
@@ -16,7 +16,7 @@
 #include "serialize.h"
 #include "byteBuffer.h"
 #include "noDefaultMethods.h"
-#include "../pv/pvIntrospect.h"
+#include <pvIntrospect.h>
 
 namespace epics {
     namespace pvData {