v1.40

wrong "fix" in 1.39 passed tests but crashed large middleware app
RuedigerMoeller · Mar 6, 2014 · 25151b9 · 25151b9
1 parent 1b6bb3c
commit 25151b9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 28 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ import java.util.zip.ZipFile
 
 apply plugin: 'java'
 apply plugin: 'maven'
-version="1.39"
+version="1.40"
 
 
 jar.baseName='fst'

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.ruedigermoeller</groupId>
     <artifactId>fst</artifactId>
-    <version>1.39</version>
+    <version>1.40</version>
 
     <description>a fast java serialization drop in-replacement + some serialization based utils (Structs, OffHeap Memory)</description>
     <url>https://code.google.com/p/fast-serialization/</url>

diff --git a/src/main/java/de/ruedigermoeller/serialization/FSTClazzInfo.java b/src/main/java/de/ruedigermoeller/serialization/FSTClazzInfo.java
@@ -444,7 +444,7 @@ public FSTFieldInfo(Class[] possibleClasses, Field fi, boolean ignoreAnnotations
                         try {
                             memOffset = (int)FSTUtil.unFlaggedUnsafe.objectFieldOffset(fi);
                         } catch ( Throwable th ) {
-                            throw FSTUtil.rethrow(th);
+                            //throw FSTUtil.rethrow(th);
                         }
                     }
                 }

diff --git a/src/main/java/de/ruedigermoeller/serialization/util/FSTInputStream.java b/src/main/java/de/ruedigermoeller/serialization/util/FSTInputStream.java
@@ -47,17 +47,6 @@ public FSTInputStream(InputStream in) {
     public void initFromStream(InputStream in) {
         try {
             this.in = in;
-            if ( in instanceof ByteArrayInputStream ) {
-                int available = in.available();
-                buf = cachedBuffer.get();
-                if ( buf == null || buf.length < available) {
-                    buf = new byte[available];
-                    cachedBuffer.set(buf);
-                }
-                in.read(buf,0,available);
-                count = available;
-                return;
-            }
             if (buf==null) {
                 buf = cachedBuffer.get();
                 if ( buf == null ) {

diff --git a/src/test/java/de/ruedigermoeller/serialization/testclasses/TestRunner.java b/src/test/java/de/ruedigermoeller/serialization/testclasses/TestRunner.java
@@ -162,21 +162,21 @@ public static void main( String[] arg ) throws Exception {
         runner.charter.text("<i>intel i7 3770K 3,4 ghz, 4 core, 8 threads</i>");
         runner.charter.text("<i>"+System.getProperty("java.runtime.version")+","+System.getProperty("java.vm.name")+","+System.getProperty("os.name")+"</i>");
 
-        SerTest.WarmUP = 20000; SerTest.Run = SerTest.WarmUP*1+1;
-//        SerTest.WarmUP = 2000; SerTest.Run = 3000;
-//        runner.runAll(FrequentPrimitives.getArray(200));
-//        runner.runAll(FrequentPrimitivesExternalizable.getArray(200));
-//        runner.runAll(new FrequentCollections());
-//        runner.runAll(new LargeNativeArrays());
+//        SerTest.WarmUP = 20000; SerTest.Run = SerTest.WarmUP*1+1;
+        SerTest.WarmUP = 200; SerTest.Run = 3000;
+        runner.runAll(FrequentPrimitives.getArray(200));
+        runner.runAll(FrequentPrimitivesExternalizable.getArray(200));
+        runner.runAll(new FrequentCollections());
+        runner.runAll(new LargeNativeArrays());
         runner.runAll(new StringPerformance(0));
-//        runner.runAll(new Primitives(0).createPrimArray());
-//        runner.runAll(new PrimitiveArrays().createPrimArray());
-//        runner.runAll(new CommonCollections());
-//        runner.runAll(Trader.generateTrader(101, true));
-//        runner.runAll(ManyClasses.getArray() );
-//        runner.runAll(new ExternalizableTest());
-//        runner.runAll(new BigObject("dummy"));
-//        runner.runAll(HeavyNesting.createNestedObject(1000));
+        runner.runAll(new Primitives(0).createPrimArray());
+        runner.runAll(new PrimitiveArrays().createPrimArray());
+        runner.runAll(new CommonCollections());
+        runner.runAll(Trader.generateTrader(101, true));
+        runner.runAll(ManyClasses.getArray() );
+        runner.runAll(new ExternalizableTest());
+        runner.runAll(new BigObject("dummy"));
+        runner.runAll(HeavyNesting.createNestedObject(1000));
         runner.charter.closeDoc();
         FSTTestApp.main(new String[0]);
     }