diff options
| author | slewis | 2013-05-22 04:21:08 +0000 |
|---|---|---|
| committer | slewis | 2013-05-22 04:21:08 +0000 |
| commit | ae7e9510010a820b8106827dfa08db7594eb3e20 (patch) | |
| tree | 27ce3dcf6296c06ce51302c17f0ce17daa237ce8 | |
| parent | 9203bff2c82692af99d9f4897be8ee731d2c6181 (diff) | |
| download | org.eclipse.ecf-ae7e9510010a820b8106827dfa08db7594eb3e20.tar.gz org.eclipse.ecf-ae7e9510010a820b8106827dfa08db7594eb3e20.tar.xz org.eclipse.ecf-ae7e9510010a820b8106827dfa08db7594eb3e20.zip | |
Final Final fix for 408451
2 files changed, 2 insertions, 1 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java index 84b3081e2..5666ae1e0 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java @@ -458,6 +458,7 @@ public class RemoteServiceAdmin implements org.osgi.service.remoteserviceadmin.RemoteConstants.ENDPOINT_ID, UUID.randomUUID().toString()); props.put(org.osgi.framework.Constants.OBJECTCLASS, new String[] { UUID.randomUUID().toString() }); + props.put(org.osgi.service.remoteserviceadmin.RemoteConstants.SERVICE_IMPORTED_CONFIGS, UUID.randomUUID().toString()); checkEndpointPermissionRead( "checkRSAReadAccess", new org.osgi.service.remoteserviceadmin.EndpointDescription( //$NON-NLS-1$ props)); diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java index ebad67f86..bfc70e55c 100644 --- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution/src/org/eclipse/ecf/tests/osgi/services/distribution/AbstractRemoteServiceAccessTest.java @@ -26,7 +26,7 @@ import org.osgi.util.tracker.ServiceTracker; public abstract class AbstractRemoteServiceAccessTest extends AbstractDistributionTest { - protected static final int REGISTER_WAIT = Integer.parseInt(System.getProperty("waittime","30000")); + protected static final int REGISTER_WAIT = Integer.parseInt(System.getProperty("waittime","20000")); private final String classname = TestServiceInterface1.class.getName(); private ServiceTracker st; |