diff -Nru /tmp/freemarker-2.3.19-vanilla/build.xml ./build.xml
--- /tmp/freemarker-2.3.19-vanilla/build.xml 2012-06-12 13:38:26.006881768 +0300
+++ ./build.xml 2012-06-12 15:53:32.799965578 +0300
@@ -54,13 +54,14 @@
-
-
-
-
+
+
+
+
+
-
+
@@ -86,11 +87,12 @@
+
-
+
@@ -561,8 +563,7 @@
-
-
+
diff -Nru /tmp/freemarker-2.3.19-vanilla/src/freemarker/ext/beans/BeansWrapper.java ./src/freemarker/ext/beans/BeansWrapper.java
--- /tmp/freemarker-2.3.19-vanilla/src/freemarker/ext/beans/BeansWrapper.java 2012-06-12 13:38:26.050881216 +0300
+++ ./src/freemarker/ext/beans/BeansWrapper.java 2012-06-12 15:53:29.409008205 +0300
@@ -232,7 +232,7 @@
*/
public BeansWrapper() {
if(javaRebelAvailable) {
- JavaRebelIntegration.registerWrapper(this);
+ //JavaRebelIntegration.registerWrapper(this);
}
}
@@ -1672,13 +1672,7 @@
private static boolean isJavaRebelAvailable() {
- try {
- JavaRebelIntegration.testAvailability();
- return true;
- }
- catch(NoClassDefFoundError e) {
- return false;
- }
+ return false;
}
/**
diff -Nru /tmp/freemarker-2.3.19-vanilla/src/freemarker/log/SLF4JLoggerFactory.java ./src/freemarker/log/SLF4JLoggerFactory.java
--- /tmp/freemarker-2.3.19-vanilla/src/freemarker/log/SLF4JLoggerFactory.java 2012-06-12 13:38:26.037881378 +0300
+++ ./src/freemarker/log/SLF4JLoggerFactory.java 2012-06-12 15:53:26.610043396 +0300
@@ -86,7 +86,7 @@
public void debug(String message, Throwable t) {
logger.log(null, ADAPTER_FQCN,
- LocationAwareLogger.DEBUG_INT, message, null, t);
+ LocationAwareLogger.DEBUG_INT, message, t);
}
public void info(String message) {
@@ -95,7 +95,7 @@
public void info(String message, Throwable t) {
logger.log(null, ADAPTER_FQCN,
- LocationAwareLogger.INFO_INT, message, null, t);
+ LocationAwareLogger.INFO_INT, message, t);
}
public void warn(String message) {
@@ -104,7 +104,7 @@
public void warn(String message, Throwable t) {
logger.log(null, ADAPTER_FQCN,
- LocationAwareLogger.WARN_INT, message, null, t);
+ LocationAwareLogger.WARN_INT, message, t);
}
public void error(String message) {
@@ -113,7 +113,7 @@
public void error(String message, Throwable t) {
logger.log(null, ADAPTER_FQCN,
- LocationAwareLogger.ERROR_INT, message, null, t);
+ LocationAwareLogger.ERROR_INT, message, t);
}
public boolean isDebugEnabled() {