db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1074789 - in /db/derby/code/trunk/java/engine: build.xml org/apache/derby/impl/services/monitor/TopService.java org/apache/derby/mbeans/build.xml
Date Sat, 26 Feb 2011 03:42:25 GMT
Author: dag
Date: Sat Feb 26 03:42:25 2011
New Revision: 1074789

URL: http://svn.apache.org/viewvc?rev=1074789&view=rev
Log:
DERBY-4741 Make embedded Derby work reliably in the presence of thread interrupts

Patch derby-4741-fix-compilation, which reintroduces the change that
was backed out in svn 1073846, along with build changes, to avoid the
issue we had with it.


Modified:
    db/derby/code/trunk/java/engine/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
    db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml

Modified: db/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/build.xml?rev=1074789&r1=1074788&r2=1074789&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/build.xml (original)
+++ db/derby/code/trunk/java/engine/build.xml Sat Feb 26 03:42:25 2011
@@ -74,9 +74,9 @@
     <ant dir="${derby.engine.dir}/iapi/reference"/>
     <ant dir="${derby.engine.dir}/authentication"/>
     <ant dir="${derby.engine.dir}/security"/> 
-  	<ant dir="${derby.engine.dir}/mbeans"/>
     <ant dir="${derby.engine.dir}/io"/>
      <ant dir="${derby.engine.dir}/iapi" target="compile_iapi_error_jsr169"/>
+    <ant dir="${derby.engine.dir}/mbeans"/>
      <ant dir="${derby.engine.dir}/database"/>
      <ant dir="${derby.engine.dir}/impl" target="compile_impl_169"/>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java?rev=1074789&r1=1074788&r2=1074789&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
Sat Feb 26 03:42:25 2011
@@ -28,7 +28,7 @@ import org.apache.derby.iapi.services.mo
 import org.apache.derby.iapi.error.StandardException;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
-// import org.apache.derby.iapi.util.InterruptStatus;
+import org.apache.derby.iapi.util.InterruptStatus;
 import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.iapi.reference.EngineType;
 
@@ -188,7 +188,7 @@ final class TopService {
 				try {
 					wait();
 				} catch (InterruptedException ioe) {
-                    // InterruptStatus.setInterrupted();
+                    InterruptStatus.setInterrupted();
 				}
 			}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml?rev=1074789&r1=1074788&r2=1074789&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml Sat Feb 26 03:42:25
2011
@@ -50,6 +50,8 @@
       <classpath>
         <pathelement path="${compile.classpath}"/>
       </classpath>
+      <sourcepath>
+      </sourcepath>
       <include name="${derby.dir}/mbeans/**"/>
     </javac>
   </target>



Mime
View raw message