From 026875dd5256051d4e3504f1d9b01f7ce2bb70ff Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 3 Oct 2015 11:44:02 +0200 Subject: Bug 1243 - Fix IOUtil.cleanPathString(..) special case ; Allow IOUtil and Uri to handle relative path Fix IOUtil.cleanPathString(..) special case: Special case '/a/./../b' -> '/b' requires to resolve './' before '../'. Allow IOUtil and Uri to handle relative path: - IOUtil.getParentOf(..) - IOUtil.cleanPathString(..) Handle cases: 'a/./../b' -> 'b' '.././b' -> '../b' - Uri: Handle null scheme --- src/java/com/jogamp/common/util/SourcedInterruptedException.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/java/com/jogamp/common/util/SourcedInterruptedException.java') diff --git a/src/java/com/jogamp/common/util/SourcedInterruptedException.java b/src/java/com/jogamp/common/util/SourcedInterruptedException.java index 49dcd86..2483d5b 100644 --- a/src/java/com/jogamp/common/util/SourcedInterruptedException.java +++ b/src/java/com/jogamp/common/util/SourcedInterruptedException.java @@ -150,7 +150,7 @@ public class SourcedInterruptedException extends InterruptedException implements s.println(s0+" by "+getClass().getSimpleName()+": "+getMessage()+" on thread "+Thread.currentThread().getName()); ExceptionUtils.dumpStack(s, getStackTrace(), 0, -1); if( null != interruptSource ) { - ExceptionUtils.dumpCause(s, s0, interruptSource, 1); + ExceptionUtils.dumpCause(s, s0, interruptSource, 1, -1, -1); } } @@ -158,9 +158,9 @@ public class SourcedInterruptedException extends InterruptedException implements public final void printStackTrace(final PrintStream s) { s.println(getClass().getSimpleName()+": "+getMessage()+" on thread "+Thread.currentThread().getName()); ExceptionUtils.dumpStack(s, getStackTrace(), 0, -1); - final int causeDepth = ExceptionUtils.dumpCause(s, "Caused", getCause(), 1); + final int causeDepth = ExceptionUtils.dumpCause(s, "Caused", getCause(), 1, -1, -1); if( null != interruptSource ) { - ExceptionUtils.dumpCause(s, "InterruptSource", interruptSource, causeDepth); + ExceptionUtils.dumpCause(s, "InterruptSource", interruptSource, causeDepth, -1, -1); } } } -- cgit v1.2.3