tweaks to host startup

eucalyptus · Nov 7, 2011 · a4b50e4 · a4b50e4
1 parent 2a0f802
commit a4b50e4
Show file tree

Hide file tree

Showing 6 changed files with 206 additions and 214 deletions.
diff --git a/clc/.classpath b/clc/.classpath
diff --git a/clc/.project b/clc/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>eee_clc_dev:clc</name>
+	<name>grze_eee_clc_dev:clc</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/clc/eucadmin/.project b/clc/eucadmin/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>eee_clc_dev:eucadmin</name>
+	<name>grze_eee_clc_dev:eucadmin</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Hosts.java b/clc/modules/msgs/src/main/java/com/eucalyptus/bootstrap/Hosts.java
@@ -702,7 +702,7 @@ public boolean apply( final Host arg0 ) {
 
   }
 
-  public enum Coordinator implements Predicate<Host>, Supplier<Host>, Function<Collection<Host>, Host> {
+  public enum Coordinator implements Predicate<Host> {
     INSTANCE;
     private final AtomicLong    currentStartTime   = new AtomicLong( Long.MAX_VALUE );
 
@@ -730,29 +730,22 @@ public Host createLocalHost( ) {
       return new Host( Coordinator.INSTANCE.currentStartTime.get( ) );
     }
 
-    @Override
-    public Host get( ) {
-      return this.apply( Hosts.hostMap.values( ) );
-    }
-
-    @Override
     public Host apply( final Collection<Host> input ) {
       Host ret = null;
       try {
         ret = Iterables.find( input, this );
       } catch ( final NoSuchElementException ex ) {
-        ret = Hosts.localHost( );
       }
       LOG.debug( "Found coordinator: " + ret );
       return ret;
     }
 
     public Boolean isLocalhost( ) {
-      return this.apply( hostMap.values( ) ).isLocalHost( );
+      try {
-    }
+        return Iterables.find( hostMap.values( ), this ).isLocalHost( );
-
+      } catch ( final NoSuchElementException ex ) {
-    public boolean getCurrentCoordinator( ) {
+        return false;
-      return this.isLocalhost( );
+      }
     }
 
     public long getCurrentStartTime( ) {

diff --git a/devel/.project b/devel/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>eee_clc_dev:devel</name>
+	<name>grze_eee_clc_dev:devel</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/project/.project b/project/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>eee_clc_dev:c</name>
+	<name>grze_eee_clc_dev:c</name>
 	<comment></comment>
 	<projects>
 	</projects>