Merge pull request #23569 from arjantijms/23566_qualify_yield_calls
#23566 Qualify calls to yield()
diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java
index 4cbe659..7740dfb 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java
@@ -31,12 +31,6 @@
package com.sun.jts.CosTransactions;
-import com.sun.enterprise.transaction.jts.api.TransactionRecoveryFence;
-import com.sun.jts.codegen.jtsxa.OTSResource;
-import com.sun.jts.jtsxa.OTSResourceImpl;
-import com.sun.jts.utils.LogFormatter;
-import com.sun.logging.LogDomains;
-
import java.io.File;
import java.io.RandomAccessFile;
import java.util.ArrayList;
@@ -58,6 +52,12 @@
import org.omg.CORBA.SystemException;
import org.omg.CORBA.TRANSIENT;
import org.omg.CosTransactions.Status;
+
+import com.sun.enterprise.transaction.jts.api.TransactionRecoveryFence;
+import com.sun.jts.codegen.jtsxa.OTSResource;
+import com.sun.jts.jtsxa.OTSResourceImpl;
+import com.sun.jts.utils.LogFormatter;
+import com.sun.logging.LogDomains;
/**
* This class manages information required for recovery, and also general
* state regarding transactions in a process.
@@ -563,7 +563,7 @@
_logger.logp(Level.FINE,"RecoveryManager","resync()",
"Before invoking commit on the reconstructed coordinator, "+
"GTID is: "+
- ((TopCoordinator)coord).superInfo.globalTID.toString());
+ coord.superInfo.globalTID.toString());
}
@@ -596,7 +596,7 @@
"Before invoking rollback on the"+
"reconstructed coordinator :"+
"GTID is : "+
- ((TopCoordinator)coord).superInfo.globalTID.toString());
+ coord.superInfo.globalTID.toString());
}
coord.rollback(true);
@@ -1782,12 +1782,14 @@
private final Semaphore semaphore = new Semaphore(1, true);
+ @Override
public void start() {
}
/**
* {@inheritDoc}
*/
+ @Override
public void raiseFence() {
try {
semaphore.acquire();
@@ -1799,6 +1801,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void lowerFence() {
semaphore.release();
}
@@ -1851,8 +1854,9 @@
*
* @see
*/
+ @Override
public void run() {
- yield();
+ Thread.yield();
if (_logger.isLoggable(Level.FINE)) {
_logger.logp(Level.FINE,"ResyncThread","run()","Before invoking RecoveryManager.recover()");
diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java
index 04c4b73..e2fa146 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ProcessExecutor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,22 +16,17 @@
package com.sun.enterprise.util;
-//JDK imports
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.OutputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
-import java.io.BufferedReader;
import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.FileReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.util.ArrayList;
@@ -41,6 +36,7 @@
* @version 1.0
* @deprecated Use ProcessManager instead
*/
+@Deprecated
public class ProcessExecutor {
public static final long kDefaultTimeoutMillis = 600000;
public static final long kSleepTime = 2000;
@@ -120,7 +116,7 @@
mCmdStrings[i] = mCmdStrings[i].replace(fwdSlashChar, backSlashChar);
}
}
- mTimeoutMilliseconds = (long) timeoutSeconds * 1000;
+ mTimeoutMilliseconds = timeoutSeconds * 1000;
}
/**
@@ -628,6 +624,7 @@
mOutStream = out;
}
+ @Override
public void run() {
// check for null stream
if (mInStream == null)
@@ -642,7 +639,7 @@
mOutStream.write(buffer, 0, byteCnt);
mOutStream.flush();
}
- yield();
+ Thread.yield();
}
}
catch (IOException e) {
