You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/02/10 20:29:22 UTC
svn commit: r908643 - in
/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src:
main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/
main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/
test/java/calculator/dosgi/test/
Author: rfeng
Date: Wed Feb 10 19:28:53 2010
New Revision: 908643
URL: http://svn.apache.org/viewvc?rev=908643&view=rev
Log:
Fix some of minor bugs discovered by FindBugs
Modified:
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java?rev=908643&r1=908642&r2=908643&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java Wed Feb 10 19:28:53 2010
@@ -145,8 +145,10 @@
public synchronized void added(EndpointDescription endpointDescription, String matchedFilter) {
if (endpointDescriptions.putValue(matchedFilter, endpointDescription)) {
Collection<ListenerInfo> listenerInfos = listeners.get(matchedFilter);
- for (ListenerInfo listener : listenerInfos) {
- importEndpoint(listener, endpointDescription);
+ if (listenerInfos != null) {
+ for (ListenerInfo listener : listenerInfos) {
+ importEndpoint(listener, endpointDescription);
+ }
}
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java?rev=908643&r1=908642&r2=908643&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java Wed Feb 10 19:28:53 2010
@@ -259,7 +259,7 @@
props.put("endpoint.id", ep.getId());
props.put("objectClass", ep.getInterfaces());
props.put("service.imported.configs", ep.getConfigurationTypes());
- props.put("timestamp", new Long(System.currentTimeMillis()));
+ props.put("timestamp", Long.valueOf(System.currentTimeMillis()));
Object bindings = ep.getProperties().get("org.osgi.sca.bindings");
if (bindings != null) {
props.put("org.osgi.sca.bindings", bindings);
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java?rev=908643&r1=908642&r2=908643&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java Wed Feb 10 19:28:53 2010
@@ -90,7 +90,7 @@
Map<String, Object> props = new HashMap<String, Object>(sd.getProperties());
props.put(Constants.OBJECTCLASS, sd.getInterfaces().toArray(new String[sd.getInterfaces().size()]));
if (!props.containsKey(ENDPOINT_SERVICE_ID)) {
- props.put(ENDPOINT_SERVICE_ID, new Long(System.currentTimeMillis()));
+ props.put(ENDPOINT_SERVICE_ID, Long.valueOf(System.currentTimeMillis()));
}
if (!props.containsKey(ENDPOINT_FRAMEWORK_UUID)) {
props.put(ENDPOINT_FRAMEWORK_UUID, OSGiHelper.getFrameworkUUID(context));
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java?rev=908643&r1=908642&r2=908643&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java Wed Feb 10 19:28:53 2010
@@ -216,6 +216,7 @@
file.read(fileContents);
jarOut.write(fileContents);
jarOut.closeEntry();
+ file.close();
}
static URL generateCalculatorBundle() throws IOException {