diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-06-17 12:52:11 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-06-17 12:52:11 +0200 |
| commit | c0640bec42634e020aa8d401db1a40c19ae1f395 (patch) | |
| tree | 878a0d9f3643ba0987b43695b0dd94b9c6ba747a /objective-c | |
| parent | 3.6 CHANGELOG updates (diff) | |
| download | ice-c0640bec42634e020aa8d401db1a40c19ae1f395.tar.bz2 ice-c0640bec42634e020aa8d401db1a40c19ae1f395.tar.xz ice-c0640bec42634e020aa8d401db1a40c19ae1f395.zip | |
Fixed servant locator reference counting issue (TCH-249)
Diffstat (limited to 'objective-c')
| -rw-r--r-- | objective-c/config/Make.rules | 10 | ||||
| -rw-r--r-- | objective-c/src/Ice/ObjectAdapterI.mm | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules index ebf09cfbca2..4001930606b 100644 --- a/objective-c/config/Make.rules +++ b/objective-c/config/Make.rules @@ -66,14 +66,14 @@ endif bindir = $(top_srcdir)/bin ifdef ice_src_dist - libdir = $(top_srcdir)/lib + libdir = $(top_srcdir)/lib includedir = $(top_srcdir)/include else - libdir = $(ice_dir)/$(libsubdir) + libdir = $(ice_dir)/$(libsubdir) testlibdir = $(top_srcdir)/lib - includedir = $(ice_dir)/includemak + includedir = $(ice_dir)/include endif -headerdir = $(top_srcdir)/include +headerdir = $(top_srcdir)/include install_includedir := $(prefix)/include/objc install_libdir := $(prefix)/$(libsubdir) @@ -89,7 +89,7 @@ SLICE2OBJCFLAGS = $(ICECPPFLAGS) FLEXFLAGS = BISONFLAGS = -dvt CPPFLAGS += -I$(includedir) -LDFLAGS = $(OBJCFLAGS) -L$(libdir) +LDFLAGS = $(OBJCFLAGS) $(ARCFLAGS) -L$(libdir) ifndef ice_src_dist LDFLAGS += -L$(testlibdir) endif diff --git a/objective-c/src/Ice/ObjectAdapterI.mm b/objective-c/src/Ice/ObjectAdapterI.mm index 41b30a55e4e..92ae7570a6f 100644 --- a/objective-c/src/Ice/ObjectAdapterI.mm +++ b/objective-c/src/Ice/ObjectAdapterI.mm @@ -81,6 +81,7 @@ public: { return _cookie; } + private: id _cookie; @@ -249,7 +250,7 @@ public: id<ICEServantLocator> locator() const { - return _locator; + return [[_locator retain] autorelease]; } private: |