Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > 728a473a6a9754cf4bb435ba560b662b > files > 7

apache-commons-jci-1.0-6.mga3.src.rpm

diff -Nru commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
--- commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java	2007-06-14 22:23:18.000000000 +0200
+++ commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java	2012-06-13 11:57:32.778432297 +0200
@@ -18,8 +18,8 @@
 package org.apache.commons.jci.compilers;
 
 import org.apache.commons.jci.problems.CompilationProblem;
-import org.codehaus.janino.Location;
-import org.codehaus.janino.Scanner.LocatedException;
+import org.codehaus.commons.compiler.Location;
+import org.codehaus.commons.compiler.LocatedException;
 
 /**
  * Janino version of a CompilationProblem
diff -Nru commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
--- commons-jci-1.0-src/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java	2007-06-14 22:23:18.000000000 +0200
+++ commons-jci-1.0-src-gil/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java	2012-06-13 12:57:53.097609355 +0200
@@ -34,18 +34,18 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.janino.ClassLoaderIClassLoader;
-import org.codehaus.janino.CompileException;
-import org.codehaus.janino.DebuggingInformation;
+import org.codehaus.commons.compiler.CompileException;
+//import org.codehaus.janino.DebuggingInformation;
 import org.codehaus.janino.Descriptor;
 import org.codehaus.janino.IClass;
 import org.codehaus.janino.IClassLoader;
 import org.codehaus.janino.Java;
-import org.codehaus.janino.Location;
+import org.codehaus.commons.compiler.Location;
 import org.codehaus.janino.Parser;
 import org.codehaus.janino.Scanner;
 import org.codehaus.janino.UnitCompiler;
 import org.codehaus.janino.WarningHandler;
-import org.codehaus.janino.Scanner.LocatedException;
+import org.codehaus.commons.compiler.LocatedException;
 import org.codehaus.janino.UnitCompiler.ErrorHandler;
 import org.codehaus.janino.util.ClassFile;
 
@@ -112,7 +112,7 @@
                     }
                 });
                 log.debug("compile " + className);
-                final ClassFile[] classFiles = uc.compileUnit(DebuggingInformation.ALL);
+                final ClassFile[] classFiles = uc.compileUnit(true, true, true);
                 for (int i = 0; i < classFiles.length; i++) {
                     log.debug("compiled " + classFiles[i].getThisClassName());
                     classes.put(classFiles[i].getThisClassName(), classFiles[i].toByteArray());
@@ -148,7 +148,11 @@
         final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, pClassLoader);
         for (int i = 0; i < pSourceNames.length; i++) {
             log.debug("compiling " + pSourceNames[i]);
-            icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
+            try {
+                icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
+            } catch (ClassNotFoundException e) {
+                log.error(e);
+            }
         }
         
         // Store all fully compiled classes