diff options
| author | Mark Spruiell <mes@zeroc.com> | 2002-09-12 02:34:15 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2002-09-12 02:34:15 +0000 |
| commit | 7050c34b68215ba1e097ed9f85a4823d0187cdbf (patch) | |
| tree | be6a0260848a694afd0211a5ef0739f09d436fb7 /java/src | |
| parent | Fixed test that was broken by Slice changes (more stringent check for (diff) | |
| download | ice-7050c34b68215ba1e097ed9f85a4823d0187cdbf.tar.bz2 ice-7050c34b68215ba1e097ed9f85a4823d0187cdbf.tar.xz ice-7050c34b68215ba1e097ed9f85a4823d0187cdbf.zip | |
changing ice_removeFacet to return Object
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/Object.java | 2 | ||||
| -rw-r--r-- | java/src/Ice/ObjectImpl.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java index 6e7778dc755..d4b66eb95d8 100644 --- a/java/src/Ice/Object.java +++ b/java/src/Ice/Object.java @@ -42,7 +42,7 @@ public interface Object void ice_addFacet(Object facet, String name); - void ice_removeFacet(String name); + Object ice_removeFacet(String name); void ice_removeAllFacets(); diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java index b69302d7e7d..724f13c161e 100644 --- a/java/src/Ice/ObjectImpl.java +++ b/java/src/Ice/ObjectImpl.java @@ -337,12 +337,12 @@ public class ObjectImpl implements Object } } - public final void + public final Object ice_removeFacet(String name) { synchronized(_activeFacetMap) { - _activeFacetMap.remove(name); + return (Object)_activeFacetMap.remove(name); } } |