# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: C:\dev\projects\glassfish\3.1.1\transaction\jts\src\main\java\com\sun\jts\CosTransactions # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: RegisteredResources.java --- RegisteredResources.java Base (BASE) +++ RegisteredResources.java Locally Modified (Based On LOCAL) @@ -485,7 +485,6 @@ * @see */ Vote distributePrepare() throws HeuristicMixed, HeuristicHazard { - boolean isProxy = false; Vote result = Vote.VoteReadOnly; int laoIndex = -1; boolean rmErr = false; @@ -499,7 +498,7 @@ for (int i = 0; i < nRes && result != Vote.VoteRollback; i++) { - + boolean isProxy = false; Resource currResource = (Resource) resourceObjects.get(i); @@ -727,7 +726,6 @@ */ void distributeCommit() throws HeuristicMixed, HeuristicHazard, NotPrepared { boolean infiniteRetry = true; - boolean isProxy = false; boolean heuristicException = false; boolean heuristicMixed = false; @@ -755,7 +753,7 @@ boolean transactionCompleted = true; String msg = null; for (int i = 0; i < nRes; i++) { - + boolean isProxy = false; Resource currResource = (Resource) resourceObjects.get(i); // If the current Resource in the browse is not in the registered @@ -994,7 +992,6 @@ boolean infiniteRetry = true; boolean heuristicMixed = false; - boolean isProxy = false; // First, get the retry count. @@ -1020,7 +1017,7 @@ boolean transactionCompleted = true; String msg = null; for (int i = 0; i < nRes; i++) { - + boolean isProxy = false; Resource currResource = (Resource)resourceObjects.get(i); // If the current Resource in the browse is not in the registered @@ -1232,8 +1229,6 @@ private void distributeForget(int retries, boolean infinite, boolean heuristicMixed) throws HeuristicMixed, HeuristicHazard { - boolean isProxy = false; - // Force the log record to ensure that all // heuristic Resources are logged. @@ -1245,7 +1240,7 @@ // may forget the heuristic information at this point for (int i = 0; i < nRes; i++) { - + boolean isProxy = false; // If the current Resource in the browse is not in the heuristic // state, skip over it. @@ -1360,13 +1355,12 @@ throws TRANSACTION_ROLLEDBACK { boolean exceptionRaised = false; - boolean isProxy = false; // Browse through the participants, committing them. The following is // intended to be done asynchronously as a group of operations. for (int i = 0; i < nRes; i++) { - + boolean isProxy = false; SubtransactionAwareResource currResource = (SubtransactionAwareResource)resourceObjects.get(i); @@ -1422,13 +1416,12 @@ * @see */ void distributeSubrollback() { - boolean isProxy = false; - // Browse through the participants, rolling them back. The following is // intended to be done asynchronously as a group of operations. for (int i = 0; i < nRes; i++) { + boolean isProxy = false; SubtransactionAwareResource currResource = (SubtransactionAwareResource) resourceObjects.get(i);