From 753d3e198879042afa1be6547dee5f557c22b36c Mon Sep 17 00:00:00 2001
From: slewis
Date: Tue, 13 Mar 2018 11:24:46 -0700
Subject: Additional fixes for bug
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205

Fixes use of osgi.basic.timeout

Change-Id: Iee55df4b03974544de4f0ed4c350a601ccf12aba
---
 .../src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'framework/bundles')

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
-- 
cgit v1.2.3