You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by th...@apache.org on 2009/05/03 22:09:11 UTC
svn commit: r771119 - in /incubator/river/jtsk/trunk:
qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/
src/com/sun/jini/mahalo/ src/com/sun/jini/mercury/
src/com/sun/jini/outrigger/ src/com/sun/jini/outrigger/snaplogstore/
src/net/jini/s...
Author: thobbs
Date: Sun May 3 20:09:11 2009
New Revision: 771119
URL: http://svn.apache.org/viewvc?rev=771119&view=rev
Log:
Application of patches submitted for RIVER-288 and RIVER-305
Modified:
incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java
incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/FastList.java
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/snaplogstore/PendingTxn.java
incubator/river/jtsk/trunk/src/net/jini/security/GrantPermission.java
Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java?rev=771119&r1=771118&r2=771119&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/preferredClassLoader/GetPermissions.java Sun May 3 20:09:11 2009
@@ -21,39 +21,24 @@
// com.sun.jini.qa.harness
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.QAConfig;
-
-// com.sun.jini.qa
-import com.sun.jini.qa.harness.QATest;
-import com.sun.jini.qa.harness.QAConfig;
// java.io
-import java.io.IOException;
import java.io.FilePermission;
// java.net
-import java.net.URL;
import java.net.SocketPermission;
import java.net.InetAddress;
// java.util
import java.util.Enumeration;
-// java.util.logging
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
// java.security
import java.security.ProtectionDomain;
import java.security.PermissionCollection;
import java.security.Permission;
import java.security.CodeSource;
-// davis packages
-import net.jini.loader.pref.PreferredClassLoader;
-
// instrumented preferred class loader
-import com.sun.jini.test.spec.loader.util.Item;
import com.sun.jini.test.spec.loader.util.Util;
import com.sun.jini.test.spec.loader.util.QATestPreferredClassLoader;
@@ -370,10 +355,10 @@
// Fast fail approach
throw new TestException(message);
}
- Enumeration enum = pc.elements();
+ Enumeration permissions = pc.elements();
- while (enum.hasMoreElements()) {
- Permission p = (Permission) enum.nextElement();
+ while (permissions.hasMoreElements()) {
+ Permission p = (Permission) permissions.nextElement();
logger.log(Level.FINE, "Permission: " + p.toString());
if (isHttp) {
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java?rev=771119&r1=771118&r2=771119&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java Sun May 3 20:09:11 2009
@@ -149,7 +149,7 @@
if (operationsLogger.isLoggable(Level.FINER)) {
operationsLogger.exiting(SettlerTask.class.getName(),
- "tryOnce", Boolean.valueOf(true));
+ "tryOnce", Boolean.TRUE);
}
return true;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java?rev=771119&r1=771118&r2=771119&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java Sun May 3 20:09:11 2009
@@ -4802,7 +4802,7 @@
if (logger.isLoggable(level)) {
if (attrs == null)
logger.log(level, "<null>");
- if (attrs.length == 0)
+ else if (attrs.length == 0)
logger.log(level, "<EMPTY>");
else {
logger.log(level,
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/FastList.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/FastList.java?rev=771119&r1=771118&r2=771119&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/FastList.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/FastList.java Sun May 3 20:09:11 2009
@@ -332,8 +332,7 @@
Node traversalGuard = (Node)FastList.DynamicGuard.get();
if (traversalGuard == null)
this.list.panic("Unguarded FastList traversal - 345");
-
- if (traversalGuard.list != this.list)
+ else if (traversalGuard.list != this.list)
this.list.panic("Illegal traversal of 2 FastLists");
/* When this thread last synchronized, Node.guardSet on
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/snaplogstore/PendingTxn.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/snaplogstore/PendingTxn.java?rev=771119&r1=771118&r2=771119&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/snaplogstore/PendingTxn.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/snaplogstore/PendingTxn.java Sun May 3 20:09:11 2009
@@ -120,7 +120,7 @@
// Both pending writes and pending takes are stored in the table.
// We only interested in entries from pending writes.
//
- if ((po != null) & (po instanceof WriteOp))
+ if (po instanceof WriteOp)
return ((WriteOp)po).entry;
return null;
Modified: incubator/river/jtsk/trunk/src/net/jini/security/GrantPermission.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/security/GrantPermission.java?rev=771119&r1=771118&r2=771119&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/security/GrantPermission.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/security/GrantPermission.java Sun May 3 20:09:11 2009
@@ -559,7 +559,7 @@
for (int i = 0; i < pa.length; i++) {
Permission p = pa[i];
if (p instanceof UnresolvedPermission) {
- sb.append(p + "; ");
+ sb.append(p).append("; ");
} else {
Class cl = p.getClass();
int nargs = maxConsArgs(cl);