diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-05-03 10:43:56 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-05-03 10:43:56 -0700 |
| commit | c9f4df5538ecfc0e699f86a1812332b3a2b4ff70 (patch) | |
| tree | e661261f39ee56fa66000d9b0574c35769a01ad8 | |
| parent | Updated version to 3.7.0 (diff) | |
| download | ice-c9f4df5538ecfc0e699f86a1812332b3a2b4ff70.tar.bz2 ice-c9f4df5538ecfc0e699f86a1812332b3a2b4ff70.tar.xz ice-c9f4df5538ecfc0e699f86a1812332b3a2b4ff70.zip | |
IceBT bug fix
| -rw-r--r-- | cpp/src/IceBT/Instance.cpp | 2 | ||||
| -rw-r--r-- | java-compat/src/IceBT/src/main/java/IceBT/Instance.java | 6 | ||||
| -rw-r--r-- | java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/cpp/src/IceBT/Instance.cpp b/cpp/src/IceBT/Instance.cpp index 5e827f8d2a0..588d02f6a54 100644 --- a/cpp/src/IceBT/Instance.cpp +++ b/cpp/src/IceBT/Instance.cpp @@ -17,7 +17,7 @@ using namespace IceBT; IceUtil::Shared* IceBT::upCast(IceBT::Instance* p) { return p; } IceBT::Instance::Instance(const EnginePtr& engine, Short type, const string& protocol) : - ProtocolInstance(engine->communicator(), type, protocol, true), + ProtocolInstance(engine->communicator(), type, protocol, type == BTSEndpointType), _engine(engine) { } diff --git a/java-compat/src/IceBT/src/main/java/IceBT/Instance.java b/java-compat/src/IceBT/src/main/java/IceBT/Instance.java index 7e979492efa..ab2319da7f4 100644 --- a/java-compat/src/IceBT/src/main/java/IceBT/Instance.java +++ b/java-compat/src/IceBT/src/main/java/IceBT/Instance.java @@ -15,11 +15,7 @@ class Instance extends IceInternal.ProtocolInstance { Instance(Ice.Communicator communicator, short type, String protocol) { - // - // We consider the transport to be "secure" because it uses the secure versions Android's Bluetooth API - // methods for establishing and accepting connections. The boolean argument below sets secure=true. - // - super(communicator, type, protocol, true); + super(communicator, type, protocol, type == Ice.BTSEndpointType.value); _communicator = communicator; diff --git a/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java b/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java index 326424062de..bb763a1b9dc 100644 --- a/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java +++ b/java/src/IceBT/src/main/java/com/zeroc/IceBT/Instance.java @@ -18,11 +18,7 @@ class Instance extends com.zeroc.IceInternal.ProtocolInstance { Instance(Communicator communicator, short type, String protocol) { - // - // We consider the transport to be "secure" because it uses the secure versions Android's Bluetooth API - // methods for establishing and accepting connections. The boolean argument below sets secure=true. - // - super(communicator, type, protocol, true); + super(communicator, type, protocol, type == com.zeroc.Ice.BTSEndpointType.value); _communicator = communicator; |