diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-04-03 15:15:13 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-04-03 15:15:13 -0700 |
| commit | b415955846ce0d5c2e0c283f897190ccd2c3616a (patch) | |
| tree | 10daf6bb8a05edf5052a33f10ea16c73d8ae0d89 /java/src/IceInternal/ObjectAdapterFactory.java | |
| parent | Bug 3465 - Remove _adapter members from test where unecessary (diff) | |
| download | ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.bz2 ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.xz ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.zip | |
removing Java2 mapping
Diffstat (limited to 'java/src/IceInternal/ObjectAdapterFactory.java')
| -rw-r--r-- | java/src/IceInternal/ObjectAdapterFactory.java | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java index b357ea6eb6f..8d88340d0b0 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/IceInternal/ObjectAdapterFactory.java @@ -40,10 +40,8 @@ public final class ObjectAdapterFactory // if(adapters != null) { - java.util.Iterator<Ice.ObjectAdapterI> i = adapters.values().iterator(); - while(i.hasNext()) + for(Ice.ObjectAdapterI adapter : adapters.values()) { - Ice.ObjectAdapter adapter = i.next(); adapter.deactivate(); } } @@ -92,10 +90,8 @@ public final class ObjectAdapterFactory // if(adapters != null) { - java.util.Iterator<Ice.ObjectAdapterI> i = adapters.values().iterator(); - while(i.hasNext()) + for(Ice.ObjectAdapterI adapter : adapters.values()) { - Ice.ObjectAdapter adapter = i.next(); adapter.waitForDeactivate(); } } @@ -142,10 +138,8 @@ public final class ObjectAdapterFactory // if(adapters != null) { - java.util.Iterator<Ice.ObjectAdapterI> i = adapters.values().iterator(); - while(i.hasNext()) + for(Ice.ObjectAdapterI adapter : adapters.values()) { - Ice.ObjectAdapter adapter = i.next(); adapter.destroy(); } } @@ -200,12 +194,10 @@ public final class ObjectAdapterFactory adapters = new java.util.ArrayList<Ice.ObjectAdapterI>(_adapters.values()); } - java.util.Iterator<Ice.ObjectAdapterI> p = adapters.iterator(); - while(p.hasNext()) + for(Ice.ObjectAdapterI adapter : adapters) { try { - Ice.ObjectAdapterI adapter = p.next(); if(adapter.isLocal(proxy)) { return adapter; @@ -245,10 +237,9 @@ public final class ObjectAdapterFactory adapters = new java.util.ArrayList<Ice.ObjectAdapterI>(_adapters.values()); } - java.util.Iterator<Ice.ObjectAdapterI> p = adapters.iterator(); - while(p.hasNext()) + for(Ice.ObjectAdapterI adapter : adapters) { - p.next().flushBatchRequests(); + adapter.flushBatchRequests(); } } |