/[Apache-SVN]

Revision 1492127

Jump to revision:
Author:	kahatlen
Date:	Wed Jun 12 09:51:48 2013 UTC (10 years, 10 months ago)
Changed paths:	9
Log Message:	DERBY-6114: OOME in XAMemTest.testDerby4137_TransactionTimeoutSpecifiedNotExceeded Merged revision 1492094 from trunk and manually resolved conflicts.

Changed paths

Path	Details
db/derby/code/branches/10.10/	modified , props changed
db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/timer/TimerFactory.java	modified , text changed
db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/services/build.xml	modified , text changed
db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/services/timer/Java5SingletonTimerFactory.java (Copied from db/derby/code/trunk/java/engine/org/apache/derby/impl/services/timer/Java5SingletonTimerFactory.java, r1492094)	added
db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java	modified , text changed
db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java	modified , text changed
db/derby/code/branches/10.10/java/engine/org/apache/derby/jdbc/XATransactionState.java	modified , text changed
db/derby/code/branches/10.10/java/engine/org/apache/derby/modules.properties	modified , text changed
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java	modified , text changed

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26