aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/stacktrace.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 06c134f..8cf4b53 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-12 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * stacktrace.cc (GetCallerInfo): Return nothing in case of
+ SJLJ_EXCEPTIONS is defined.
+
2005-03-12 Ranjit Mathew <rmathew@hotmail.com>
* testsuite/libjava.jacks/jacks.xfail: Add XFAILs for new JSR-201
diff --git a/libjava/stacktrace.cc b/libjava/stacktrace.cc
index 0777d90..19123e2 100644
--- a/libjava/stacktrace.cc
+++ b/libjava/stacktrace.cc
@@ -429,7 +429,7 @@ _Jv_StackTrace::GetCallerInfo (jclass checkClass, jclass *caller_class,
if (caller_meth)
*caller_meth = trace_data.foundMeth;
#else
- return NULL;
+ return;
#endif
}