incubator-river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r937283 - /incubator/river/jtsk/trunk/src/net/jini/lookup/JoinManager.java
Date Fri, 23 Apr 2010 13:17:42 GMT
Author: peter_firmstone
Date: Fri Apr 23 13:17:42 2010
New Revision: 937283

URL: http://svn.apache.org/viewvc?rev=937283&view=rev
Log:
A significant number of changes to commence integrating the new StreamServiceRegistrar and
DiscoveryManager2 implementations into Jini's API.

This is very experimental please comment, suggest improvements etc, where new classes should
go etc.

Also please check for backward compatibility issues.

Fix Constructor Signature Ambiguity

Modified:
    incubator/river/jtsk/trunk/src/net/jini/lookup/JoinManager.java

Modified: incubator/river/jtsk/trunk/src/net/jini/lookup/JoinManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/lookup/JoinManager.java?rev=937283&r1=937282&r2=937283&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/lookup/JoinManager.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/lookup/JoinManager.java Fri Apr 23 13:17:42 2010
@@ -1653,11 +1653,12 @@ public class JoinManager {
         } catch(ConfigurationException e) { /* swallow this exception */ }
     }//end constructor
      
-     public JoinManager(Object serviceProxy,
+     public JoinManager(DiscoveryListenerManagement discoveryMgr,
+                        Object serviceProxy,
                         Entry[] attrSets,
 			ServiceIDListener callback,
-			LeaseRenewalManager leaseMgr,
-                        DiscoveryListenerManagement discoveryMgr)    throws IOException
+			LeaseRenewalManager leaseMgr
+                        )    throws IOException
     {
         discMgr = discoveryMgr;
         try {
@@ -1783,11 +1784,11 @@ public class JoinManager {
                           callback, leaseMgr, config);
     }//end constructor
 
-     public JoinManager(Object serviceProxy,
+     public JoinManager(DiscoveryListenerManagement discoveryMgr,
+                        Object serviceProxy,
                         Entry[] attrSets,
 			ServiceIDListener callback,
-                        LeaseRenewalManager leaseMgr,
-			DiscoveryListenerManagement discoveryMgr,
+                        LeaseRenewalManager leaseMgr,			
                         Configuration config)
                                     throws IOException, ConfigurationException
     {
@@ -1860,11 +1861,12 @@ public class JoinManager {
         } catch(ConfigurationException e) { /* swallow this exception */ }
     }//end constructor
 
-     public JoinManager(Object serviceProxy,
+     public JoinManager(DiscoveryListenerManagement discoveryMgr,
+                        Object serviceProxy,
                         Entry[] attrSets,
 			ServiceID serviceID,
-                        LeaseRenewalManager leaseMgr,
-			DiscoveryListenerManagement discoveryMgr)
+                        LeaseRenewalManager leaseMgr
+			)
                         throws IOException
     {
         discMgr = discoveryMgr;
@@ -1953,11 +1955,11 @@ public class JoinManager {
                           (ServiceIDListener)null, leaseMgr, config);
     }//end constructor
      
-     public JoinManager(Object serviceProxy,
+     public JoinManager(DiscoveryListenerManagement discoveryMgr,
+                        Object serviceProxy,
                         Entry[] attrSets,
 			ServiceID serviceID,
-                        LeaseRenewalManager leaseMgr,
-			DiscoveryListenerManagement discoveryMgr,
+                        LeaseRenewalManager leaseMgr,			
                         Configuration config)
                                     throws IOException, ConfigurationException
     {



Mime
View raw message