diff options
| author | slewis | 2018-03-13 18:24:46 +0000 |
|---|---|---|
| committer | slewis | 2018-03-13 18:24:46 +0000 |
| commit | 753d3e198879042afa1be6547dee5f557c22b36c (patch) | |
| tree | 1879802cef9bfa97a06258da0bdf88592c9fc0f6 /framework | |
| parent | eb1a4ff73d8860fb04ff5051ffb178cb6bc5d926 (diff) | |
| download | org.eclipse.ecf-753d3e198879042afa1be6547dee5f557c22b36c.tar.gz org.eclipse.ecf-753d3e198879042afa1be6547dee5f557c22b36c.tar.xz org.eclipse.ecf-753d3e198879042afa1be6547dee5f557c22b36c.zip | |
Additional fixes for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205
Fixes use of osgi.basic.timeout
Change-Id: Iee55df4b03974544de4f0ed4c350a601ccf12aba
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java index 30803d6f1..4c87e71cc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java @@ -124,10 +124,8 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ if (defaultTimeout == null) { Object o = getRemoteServiceReference().getProperty(Constants.OSGI_BASIC_TIMEOUT_INTENT); if (o != null) { - if (o instanceof Long) - defaultTimeout = (Long) o; - else if (o instanceof Integer) - defaultTimeout = ((Integer) o).longValue(); + if (o instanceof Number) + defaultTimeout = ((Number) o).longValue(); else if (o instanceof String) defaultTimeout = Long.valueOf((String) o); } else |