river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1634322 [35/41] - in /river/jtsk/skunk/qa_refactor/trunk: qa/src/com/sun/jini/qa/harness/ qa/src/com/sun/jini/test/impl/end2end/e2etest/ qa/src/com/sun/jini/test/impl/joinmanager/ qa/src/com/sun/jini/test/impl/mahalo/ qa/src/com/sun/jini/t...
Date Sun, 26 Oct 2014 13:17:31 GMT
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/Item.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/Item.java?rev=1634322&r1=1634321&r2=1634322&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/Item.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/Item.java Sun Oct 26 13:17:28
2014
@@ -1,191 +1,190 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.sun.jini.reggie;
-
-import com.sun.jini.action.GetBooleanAction;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.proxy.MarshalledWrapper;
-import java.rmi.MarshalException;
-import java.rmi.NoSuchObjectException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.server.RemoteObject;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.jini.core.lookup.ServiceID;
-import net.jini.core.lookup.ServiceItem;
-import net.jini.security.Security;
-
-/**
- * An Item contains the fields of a ServiceItem packaged up for
- * transmission between client-side proxies and the registrar server.
- * Instances are never visible to clients, they are private to the
- * communication between the proxies and the server.
- * <p>
- * This class only has a bare minimum of methods, to minimize
- * the amount of code downloaded into clients.
- *
- * @author Sun Microsystems, Inc.
- *
- */
-class Item implements Serializable, Cloneable {
-
-    private static final long serialVersionUID = 2L;
-
-    /** Logger for Reggie. */
-    private static final Logger logger = 
-	Logger.getLogger("com.sun.jini.reggie");
-    /**
-     * Flag to enable JRMP impl-to-stub replacement during marshalling of
-     * service proxy.
-     */
-    private static final boolean enableImplToStubReplacement;
-    static {
-	Boolean b;
-	try {
-	    b = (Boolean) Security.doPrivileged(new GetBooleanAction(
-		"com.sun.jini.reggie.enableImplToStubReplacement"));
-	} catch (SecurityException e) {
-	    logger.log(Levels.HANDLED, "failed to read system property", e);
-	    b = Boolean.FALSE;
-	}
-	enableImplToStubReplacement = b.booleanValue();
-    }
-
-    /**
-     * ServiceItem.serviceID.
-     *
-     * @serial
-     */
-    public ServiceID serviceID;
-    /**
-     * The Class of ServiceItem.service converted to ServiceType.
-     *
-     * @serial
-     */
-    public final ServiceType serviceType;
-    /**
-     * The codebase of the service object.
-     *
-     * @serial
-     */
-    public final String codebase;
-    /**
-     * ServiceItem.service as a MarshalledWrapper.
-     *
-     * @serial
-     */
-    public final MarshalledWrapper service;
-    /**
-     * ServiceItem.attributeSets converted to EntryReps.
-     *
-     * @serial
-     */
-    public EntryRep[] attributeSets;
-
-    /**
-     * Converts a ServiceItem to an Item.  Any exception that results
-     * is bundled up into a MarshalException.
-     */
-    public Item(ServiceItem item) throws RemoteException {
-	Object svc = item.service;
-	if (enableImplToStubReplacement && svc instanceof Remote) {
-	    try {
-		svc = RemoteObject.toStub((Remote) svc);
-		if (logger.isLoggable(Level.FINER)) {
-		    logger.log(Level.FINER, "replacing {0} with {1}",
-			       new Object[]{ item.service, svc });
-		}
-	    } catch (NoSuchObjectException e) {
-	    }
-	}
-	serviceID = item.serviceID;
-	ServiceTypeBase stb = ClassMapper.toServiceTypeBase(svc.getClass());
-	serviceType = stb.type;
-	codebase = stb.codebase;
-	try {
-	    service = new MarshalledWrapper(svc);
-	} catch (IOException e) {
-	    throw new MarshalException("error marshalling arguments", e);
-	}
-	attributeSets = EntryRep.toEntryRep(item.attributeSets, true);
-    }
-    
-    Item(ServiceID serviceID,
-            ServiceType serviceType,
-            String codebase,
-            MarshalledWrapper service,
-            EntryRep [] attrSets)
-    {
-        this.serviceID = serviceID;
-        this.serviceType = serviceType;
-        this.codebase = codebase;
-        this.service = service;
-        attributeSets = attrSets;
-    }
-
-    /**
-     * Convert back to a ServiceItem.  If the service object cannot be
-     * constructed, it is set to null.  If an Entry cannot be constructed,
-     * it is set to null.  If a field of an Entry cannot be unmarshalled,
-     * it is set to null.
-     */
-    public ServiceItem get() {
-	Object obj = null;
-	try {
-	    obj = service.get();
-	} catch (Throwable e) {
-	    RegistrarProxy.handleException(e);
-	}
-	return new ServiceItem(serviceID,
-			       obj,
-			       EntryRep.toEntry(attributeSets));
-    }
-
-    /**
-     * Deep clone.  This is really only needed in the server,
-     * but it's very convenient to have here.
-     */
-    @Override
-    public Object clone() {
-	    EntryRep[] attrSets = (EntryRep[])attributeSets.clone();
-	    for (int i = attrSets.length; --i >= 0; ) {
-		attrSets[i] = (EntryRep)attrSets[i].clone();
-	    }
-	    return new Item(serviceID, serviceType, codebase, service, attrSets);
-    }
-
-    /**
-     * Converts an ArrayList of Item to an array of ServiceItem.
-     */
-    public static ServiceItem[] toServiceItem(List reps)
-    {
-	ServiceItem[] items = null;
-	if (reps != null) {
-	    items = new ServiceItem[reps.size()];
-	    for (int i = items.length; --i >= 0; ) {
-		items[i] = ((Item)reps.get(i)).get();
-	    }
-	}
-	return items;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sun.jini.reggie;
+
+import com.sun.jini.action.GetBooleanAction;
+import com.sun.jini.logging.Levels;
+import com.sun.jini.proxy.MarshalledWrapper;
+import java.rmi.MarshalException;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.server.RemoteObject;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.jini.core.lookup.ServiceID;
+import net.jini.core.lookup.ServiceItem;
+import net.jini.security.Security;
+
+/**
+ * An Item contains the fields of a ServiceItem packaged up for
+ * transmission between client-side proxies and the registrar server.
+ * Instances are never visible to clients, they are private to the
+ * communication between the proxies and the server.
+ * <p>
+ * This class only has a bare minimum of methods, to minimize
+ * the amount of code downloaded into clients.
+ *
+ * @author Sun Microsystems, Inc.
+ *
+ */
+class Item implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 2L;
+
+    /** Logger for Reggie. */
+    private static final Logger logger = 
+	Logger.getLogger("com.sun.jini.reggie");
+    /**
+     * Flag to enable JRMP impl-to-stub replacement during marshalling of
+     * service proxy.
+     */
+    private static final boolean enableImplToStubReplacement;
+    static {
+	Boolean b;
+	try {
+	    b = (Boolean) Security.doPrivileged(new GetBooleanAction(
+		"com.sun.jini.reggie.enableImplToStubReplacement"));
+	} catch (SecurityException e) {
+	    logger.log(Levels.HANDLED, "failed to read system property", e);
+	    b = Boolean.FALSE;
+	}
+	enableImplToStubReplacement = b.booleanValue();
+    }
+
+    /**
+     * ServiceItem.serviceID.
+     *
+     * @serial
+     */
+    public ServiceID serviceID;
+    /**
+     * The Class of ServiceItem.service converted to ServiceType.
+     *
+     * @serial
+     */
+    public final ServiceType serviceType;
+    /**
+     * The codebase of the service object.
+     *
+     * @serial
+     */
+    public final String codebase;
+    /**
+     * ServiceItem.service as a MarshalledWrapper.
+     *
+     * @serial
+     */
+    public final MarshalledWrapper service;
+    /**
+     * ServiceItem.attributeSets converted to EntryReps.
+     *
+     * @serial
+     */
+    public EntryRep[] attributeSets;
+
+    /**
+     * Converts a ServiceItem to an Item.  Any exception that results
+     * is bundled up into a MarshalException.
+     */
+    public Item(ServiceItem item) throws RemoteException {
+	Object svc = item.service;
+	if (enableImplToStubReplacement && svc instanceof Remote) {
+	    try {
+		svc = RemoteObject.toStub((Remote) svc);
+		if (logger.isLoggable(Level.FINER)) {
+		    logger.log(Level.FINER, "replacing {0} with {1}",
+			       new Object[]{ item.service, svc });
+		}
+	    } catch (NoSuchObjectException e) {
+	    }
+	}
+	serviceID = item.serviceID;
+	ServiceTypeBase stb = ClassMapper.toServiceTypeBase(svc.getClass());
+	serviceType = stb.type;
+	codebase = stb.codebase;
+	try {
+	    service = new MarshalledWrapper(svc);
+	} catch (IOException e) {
+	    throw new MarshalException("error marshalling arguments", e);
+	}
+	attributeSets = EntryRep.toEntryRep(item.attributeSets, true);
+    }
+    
+    Item(ServiceID serviceID,
+            ServiceType serviceType,
+            String codebase,
+            MarshalledWrapper service,
+            EntryRep [] attrSets)
+    {
+        this.serviceID = serviceID;
+        this.serviceType = serviceType;
+        this.codebase = codebase;
+        this.service = service;
+        attributeSets = attrSets;
+    }
+
+    /**
+     * Convert back to a ServiceItem.  If the service object cannot be
+     * constructed, it is set to null.  If an Entry cannot be constructed,
+     * it is set to null.  If a field of an Entry cannot be unmarshalled,
+     * it is set to null.
+     */
+    public ServiceItem get() {
+	Object obj = null;
+	try {
+	    obj = service.get();
+	} catch (Throwable e) {
+	    RegistrarProxy.handleException(e);
+	}
+	return new ServiceItem(serviceID,
+			       obj,
+			       EntryRep.toEntry(attributeSets));
+    }
+
+    /**
+     * Deep clone.  This is really only needed in the server,
+     * but it's very convenient to have here.
+     */
+    @Override
+    public Object clone() {
+	    EntryRep[] attrSets = (EntryRep[])attributeSets.clone();
+	    for (int i = attrSets.length; --i >= 0; ) {
+		attrSets[i] = (EntryRep)attrSets[i].clone();
+	    }
+	    return new Item(serviceID, serviceType, codebase, service, attrSets);
+    }
+
+    /**
+     * Converts an ArrayList of Item to an array of ServiceItem.
+     */
+    public static ServiceItem[] toServiceItem(List reps)
+    {
+	ServiceItem[] items = null;
+	if (reps != null) {
+	    items = new ServiceItem[reps.size()];
+	    for (int i = items.length; --i >= 0; ) {
+		items[i] = ((Item)reps.get(i)).get();
+	    }
+	}
+	return items;
+    }
+}

Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java?rev=1634322&r1=1634321&r2=1634322&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarImpl.java Sun Oct
26 13:17:28 2014
@@ -764,8 +764,8 @@ class RegistrarImpl implements Registrar
 	 * (required by TreeMap).
 	 */
 	public int compareTo(Object obj) {
-	    EventReg reg = (EventReg)obj;
 	    if (equals(obj)) return 0;
+	    EventReg reg = (EventReg)obj;
 	    if (getLeaseExpiration() < reg.getLeaseExpiration() ||
 		(getLeaseExpiration() == reg.getLeaseExpiration() &&
 		 eventID < reg.eventID))
@@ -2064,6 +2064,7 @@ class RegistrarImpl implements Registrar
 	}
 
 	/** Send the event */
+        @Override
 	public Boolean call() throws Exception {
 	    if (logger.isLoggable(Level.FINE)) {
 		logger.log(
@@ -2119,6 +2120,8 @@ class RegistrarImpl implements Registrar
         public int compareTo(EventTask o) {
             if (this.now < o.now) return -1;
             if (this.now > o.now) return 1;
+            if (this.seqNo < o.seqNo) return -1;
+            if (this.seqNo > o.seqNo) return 1;
             return 0;
         }
     }
@@ -4710,9 +4713,9 @@ class RegistrarImpl implements Registrar
     }
 
     /** Close any sockets that were sitting in the task queue. */
-    private void closeRequestSockets(List tasks) {
+    private void closeRequestSockets(List<Runnable> tasks) {
 	for (int i = tasks.size(); --i >= 0; ) {
-	    Object obj = tasks.get(i);
+	    Runnable obj = tasks.get(i);
 	    if (obj instanceof SocketTask) {
 		try {
 		    ((SocketTask)obj).socket.close();



Mime
View raw message