Author: toad
Date: 2006-11-11 20:52:35 +0000 (Sat, 11 Nov 2006)
New Revision: 10889

Modified:
   trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
Log:
No point trying every time.

Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-11-11 
20:46:52 UTC (rev 10888)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-11-11 
20:52:35 UTC (rev 10889)
@@ -136,16 +136,21 @@
                // Best performance, doesn't crash
                //encoder = FECCodeFactory.getDefault().createFECCode(k,n);
                FECCode fec;
-               try {
-                       fec = new Native8Code(k,n);
-               } catch (Throwable t) {
-                       if(!noNative) {
-                               System.err.println("Failed to load native FEC: 
"+t);
-                               t.printStackTrace();
+               if(!noNative) {
+                       try {
+                               fec = new Native8Code(k,n);
+                       } catch (Throwable t) {
+                               if(!noNative) {
+                                       System.err.println("Failed to load 
native FEC: "+t);
+                                       t.printStackTrace();
+                               }
+                               Logger.error(this, "Failed to load native FEC: 
"+t+" (k="+k+" n="+n+")", t);
+                               fec = new PureCode(k,n);
+                               if(t instanceof UnsatisfiedLinkError)
+                                       noNative = true;
                        }
-                       Logger.error(this, "Failed to load native FEC: "+t, t);
+               } else {
                        fec = new PureCode(k,n);
-                       noNative = true;
                }
                encoder = fec;
                // revert to below if above causes JVM crashes


Reply via email to