Author: tcurdt
Date: Mon Aug 13 11:51:46 2007
New Revision: 565475
URL: http://svn.apache.org/viewvc?view=rev&rev=565475
Log:
upgrade to janino 2.5.x
Modified:
commons/proper/jci/trunk/compilers/janino/pom.xml
commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
Modified: commons/proper/jci/trunk/compilers/janino/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/pom.xml?view=diff&rev=565475&r1=565474&r2=565475
==============================================================================
--- commons/proper/jci/trunk/compilers/janino/pom.xml (original)
+++ commons/proper/jci/trunk/compilers/janino/pom.xml Mon Aug 13 11:51:46 2007
@@ -52,7 +52,7 @@
<dependency>
<groupId>janino</groupId>
<artifactId>janino</artifactId>
- <version>2.4.3</version>
+ <version>2.5.7</version>
</dependency>
</dependencies>
</project>
Modified:
commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
URL:
http://svn.apache.org/viewvc/commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java?view=diff&rev=565475&r1=565474&r2=565475
==============================================================================
---
commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
(original)
+++
commons/proper/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
Mon Aug 13 11:51:46 2007
@@ -158,7 +158,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
