diff options
4 files changed, 31 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/RunTests.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/RunTests.java index 5c87a43e989..d04e95a9048 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/RunTests.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/framework/command/RunTests.java @@ -7,6 +7,7 @@ import java.io.Serializable; import java.rmi.server.ExportException; import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.concurrent.Future; import java.util.logging.Level; @@ -93,6 +94,21 @@ public class RunTests implements ITestServerCommand, Serializable { } for (IPropertyStore store : scripts) { + Set<String> arrayKeySet = global.arrayKeySet(); + for(String key:arrayKeySet){ + String[] array = global.getArray(key); + if(array != null ){ + store.put(key, array); + } + } + Set<String> keySet = global.keySet(); + for(String key:keySet){ + String val = global.get(key); + if(val != null ){ + store.put(key, val); + } + } + if (cancelAll) { statusBoard.onTestComplete(store.get(RunTestsKeys.testClass.name()), store.get(RunTestsKeys.serverOutfilePath.name()), diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/AddressBuffer.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/AddressBuffer.java index 895294a2f3f..7ea00ea2206 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/AddressBuffer.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/endpoint/AddressBuffer.java @@ -9,7 +9,7 @@ public class AddressBuffer { private InetSocketAddress address; public AddressBuffer(){ - buffer = ByteBuffer.allocate(64000); + buffer = ByteBuffer.allocate(131072); } public ByteBuffer getBuffer(){ diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SerializedClassMessage.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SerializedClassMessage.java index 95ac63a737a..eda4166610e 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SerializedClassMessage.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SerializedClassMessage.java @@ -15,6 +15,8 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; import org.eclipse.osee.ote.message.elements.ArrayElement; @@ -44,8 +46,10 @@ public class SerializedClassMessage<T> extends OteEventMessage { public void setObject(Serializable obj) throws IOException{ ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); + GZIPOutputStream gos = new GZIPOutputStream(bos); + ObjectOutputStream oos = new ObjectOutputStream(gos); oos.writeObject(obj); + oos.close(); byte[] data = bos.toByteArray(); int offset = OBJECT.getByteOffset() + getHeaderSize(); byte[] newData = new byte[data.length + offset]; @@ -58,7 +62,8 @@ public class SerializedClassMessage<T> extends OteEventMessage { public T getObject() throws IOException, ClassNotFoundException{ int offset = OBJECT.getByteOffset() + getHeaderSize(); ByteArrayInputStream bis = new ByteArrayInputStream(getData(), offset, getData().length - offset); - MyObjectInputStream ois = new MyObjectInputStream(bis); + GZIPInputStream gis = new GZIPInputStream(bis); + MyObjectInputStream ois = new MyObjectInputStream(gis); try{ Object obj = ois.readObject(); return (T)obj; diff --git a/plugins/org.eclipse.osee.ote.io/src/org/eclipse/osee/ote/io/internal/SpecializedInputStream.java b/plugins/org.eclipse.osee.ote.io/src/org/eclipse/osee/ote/io/internal/SpecializedInputStream.java index bc95a10555e..520ab0a58ca 100644 --- a/plugins/org.eclipse.osee.ote.io/src/org/eclipse/osee/ote/io/internal/SpecializedInputStream.java +++ b/plugins/org.eclipse.osee.ote.io/src/org/eclipse/osee/ote/io/internal/SpecializedInputStream.java @@ -25,10 +25,15 @@ public class SpecializedInputStream extends InputStream { public void run() { InputStreamReader isr=new InputStreamReader(monitorIn); BufferedReader br=new BufferedReader(isr); - while(true){ + boolean validSystemIn = true; + while(validSystemIn){ try{ String line = br.readLine(); - add(line); + if(line != null){ + add(line); + } else { + validSystemIn = false; + } } catch (Throwable th){ } |