javabdd-checkins

[John W. <joe...@us...>]

Update of /cvsroot/javabdd/JavaBDD/org/sf/javabdd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2782/org/sf/javabdd

Modified Files:
	TryVarOrder.java 
Log Message:
Fix compilation problem.
Also migrate to setError() version.

Index: TryVarOrder.java
===================================================================
RCS file: /cvsroot/javabdd/JavaBDD/org/sf/javabdd/TryVarOrder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TryVarOrder.java	29 Sep 2004 06:23:30 -0000	1.2
--- TryVarOrder.java	14 Oct 2004 23:04:30 -0000	1.3
***************
*** 27,31 ****
  
      static ClassLoader makeClassLoader() {
!         return HijackingClassLoader.makeClassLoader();
      }
      
--- 27,32 ----
  
      static ClassLoader makeClassLoader() {
!         //return HijackingClassLoader.makeClassLoader();
!         return ClassLoader.getSystemClassLoader();
      }
      
***************
*** 84,87 ****
--- 85,99 ----
      }
      
+     void setBDDError(int code) {
+         Class c = bdd.getClass();
+         try {
+             Method m = c.getMethod("setError", new Class[] { int.class });
+             m.invoke(bdd, new Object[] { Integer.valueOf(code) });
+         } catch (Exception x) {
+             System.err.println("Exception occurred while setting error for BDD factory: "+x.getLocalizedMessage());
+             x.printStackTrace();
+         }
+     }
+     
      /**
       * Make a domain in the BDD factory.
***************
*** 352,357 ****
          }
          if (t.isAlive()) {
!             t.stop();
!             Thread.yield(); // Help ThreadDeath exception to propagate.
              System.out.print("Free memory: "+Runtime.getRuntime().freeMemory());
              destroyBDDFactory();
--- 364,372 ----
          }
          if (t.isAlive()) {
!             setBDDError(1);
!             try {
!                 t.join();
!             } catch (InterruptedException x) {
!             }
              System.out.print("Free memory: "+Runtime.getRuntime().freeMemory());
              destroyBDDFactory();