You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2010/06/28 18:31:57 UTC
svn commit: r958625 - in /db/derby/code/branches/10.6: ./
java/testing/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java
Author: kmarsden
Date: Mon Jun 28 16:31:57 2010
New Revision: 958625
URL: http://svn.apache.org/viewvc?rev=958625&view=rev
Log:
DERBY-2318 testStreams(org.apache.derbyTesting.functionTests.te
sts.lang.StreamsTest)
Change test to get the StackTraceElements just once
Modified:
db/derby/code/branches/10.6/ (props changed)
db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java
Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 16:31:57 2010
@@ -1,2 +1,2 @@
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,952138,952237,954344,954421,954544,954748,955001,955634,956075,956234,956445,956569,956659,957260,958618
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,952138,952237,954344,954421,954544,954748,955001,955634,956075,956234,956445,956569,956659,957260,958163,958618
/db/derby/docs/trunk:954344
Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java?rev=958625&r1=958624&r2=958625&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java (original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java Mon Jun 28 16:31:57 2010
@@ -300,18 +300,19 @@ class DummyReader extends java.io.Reader
}
private void whereAmI() {
+ StackTraceElement[] stelements = new Throwable().getStackTrace();
if (count == 0) {
// see DERBY-2318 - some jvms report a line like:
// at java.lang.Throwable<init>. Ignore all Throwable lines
// for the count.
- if ((new Throwable().getStackTrace().toString()).indexOf(
+ if (stelements.toString().indexOf(
"java.lang.Throwable".toLowerCase()) >=0)
{
readerStackLevel =
- new Throwable().getStackTrace().length - 1;
+ stelements.length - 1;
}
else
- readerStackLevel = new Throwable().getStackTrace().length;
+ readerStackLevel = stelements.length;
}
}