You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/03/08 22:10:48 UTC
svn commit: r751532 -
/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/hooks/AbstractClientHook.java
Author: davidb
Date: Sun Mar 8 21:10:48 2009
New Revision: 751532
URL: http://svn.apache.org/viewvc?rev=751532&view=rev
Log:
Removed some commented out code.
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/hooks/AbstractClientHook.java
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/hooks/AbstractClientHook.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/hooks/AbstractClientHook.java?rev=751532&r1=751531&r2=751532&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/hooks/AbstractClientHook.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/hooks/AbstractClientHook.java Sun Mar 8 21:10:48 2009
@@ -66,9 +66,6 @@
String filter) {
lookupDiscoveryService(interfaceName, filter);
-// if (!lookupCurrentBundle(requestingContext, interfaceName, filter)) {
-// lookupDiscoveryService(interfaceName, filter);
-// }
}
protected void processServiceDescription(ServiceEndpointDescription sd,
@@ -127,31 +124,6 @@
return props;
}
- /*
- protected synchronized boolean lookupCurrentBundle(BundleContext context,
- String interfaceName,
- String filter) {
- // if bundle has remote-services.xml attached then those metadata
- // take precedence
- List<ServiceEndpointDescription> sds =
- new ArrayList<ServiceEndpointDescription>();
-
- // REVISIT: temporary disable, re-enable before merge!!!
- if (checkBundle()) {
- sds.addAll(OsgiUtils.getRemoteReferences(context.getBundle(),
- new String[]{interfaceName},
- Collections.EMPTY_MAP,
- false));
-
- for (ServiceEndpointDescription found : sds) {
- processServiceDescription(found,
- context,
- interfaceName);
- }
- }
- return sds.size() > 0;
- } */
-
protected synchronized void lookupDiscoveryService(String interfaceName, String filterValue) {
if (interfaceName != null) {
@@ -169,6 +141,7 @@
trackerRegistration.setProperties(trackerProperties);
}
+ @SuppressWarnings("unchecked")
private void append(Dictionary properties, String key, String additional) {
Collection existing = (Collection)properties.get(key);
if (existing == null) {