4 files changed, 6 insertions, 2 deletions
diff --git a/sca-cpp/trunk/modules/java/mod-java.cpp b/sca-cpp/trunk/modules/java/mod-java.cpp
index 8c25f6f8ef..d96861cc6d 100644
--- a/sca-cpp/trunk/modules/java/mod-java.cpp
+++ b/sca-cpp/trunk/modules/java/mod-java.cpp
@@ -73,6 +73,8 @@ const failable<lambda<value(const list<value>&)> > evalImplementation(const stri
     }
     if (contains(itype, ".cpp"))
         return modcpp::evalImplementation(path, impl, px);
+    if (contains(itype, ".widget"))
+        return mkfailure<lambda<value(const list<value>&)> >(string("Unsupported implementation type: ") + itype, -1, false);
     return mkfailure<lambda<value(const list<value>&)> >(string("Unsupported implementation type: ") + itype);
 }
 
diff --git a/sca-cpp/trunk/modules/java/mod-java.hpp b/sca-cpp/trunk/modules/java/mod-java.hpp
index e7da06e930..b68f17aa3f 100644
--- a/sca-cpp/trunk/modules/java/mod-java.hpp
+++ b/sca-cpp/trunk/modules/java/mod-java.hpp
@@ -52,7 +52,7 @@ struct applyImplementation {
         const value expr = append<value>(params, px);
         debug(expr, "modeval::java::applyImplementation::input");
         const failable<value> res = java::evalClass(jr, expr, impl);
-        const value val = !hasContent(res)? mklist<value>(value(), reason(res)) : mklist<value>(content(res));
+        const value val = !hasContent(res)? mklist<value>(value(), reason(res), rcode(res)) : mklist<value>(content(res));
         debug(val, "modeval::java::applyImplementation::result");
         return val;
     }
@@ -66,7 +66,7 @@ const failable<lambda<value(const list<value>&)> > evalImplementation(const stri
     const string cn(attributeValue("class", impl));
     const failable<java::JavaClass> jc = java::readClass(jr, path, cn);
     if (!hasContent(jc))
-        return mkfailure<lambda<value(const list<value>&)> >(reason(jc));
+        return mkfailure<lambda<value(const list<value>&)> >(jc);
     return lambda<value(const list<value>&)>(applyImplementation(content(jc), px, jr));
 }
 
diff --git a/sca-cpp/trunk/modules/java/server-test b/sca-cpp/trunk/modules/java/server-test
index 40e52d7153..0b45649ace 100755
--- a/sca-cpp/trunk/modules/java/server-test
+++ b/sca-cpp/trunk/modules/java/server-test
@@ -18,6 +18,7 @@
 #  under the License.
 
 # Setup
+rm -rf tmp
 ../http/httpd-conf tmp localhost 8090 ../server/htdocs
 ../server/server-conf tmp
 ./java-conf tmp
diff --git a/sca-cpp/trunk/modules/java/wiring-test b/sca-cpp/trunk/modules/java/wiring-test
index 941a75bc32..dd865c4c66 100755
--- a/sca-cpp/trunk/modules/java/wiring-test
+++ b/sca-cpp/trunk/modules/java/wiring-test
@@ -22,6 +22,7 @@ here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $h
 curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
+rm -rf tmp
 ../http/httpd-conf tmp localhost 8090 ../server/htdocs
 ../server/server-conf tmp
 ./java-conf tmp