/*
 * Copyright 2002-2006 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.springframework.osgi.service.support.cardinality;

import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert;

/**
 * Base around interceptor for OSGi service invokers.
 * 
 * @author Costin Leau
 * 
 */
public abstract class OsgiServiceInvoker implements MethodInterceptor {

	
	protected final Log log = LogFactory.getLog(getClass());
	
	/**
	 * Actual invocation - the class is being executed on a different object then
	 * the one exposed in the invocation object.
	 * 
	 * @param service
	 * @param invocation
	 * @return
	 * @throws Throwable
	 */
	protected Object doInvoke(Object service, MethodInvocation invocation) throws Throwable {
		Assert.notNull(service, "service should not be null!");
		return invocation.getMethod().invoke(service, invocation.getArguments());
	}

	/**
	 * Determine the target object to execute the invocation upon.
	 * 
	 * @return
	 * @throws Throwable
	 */
	protected abstract Object getTarget() throws Throwable;

	/*
	 * (non-Javadoc)
	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
	 */
	public final Object invoke(MethodInvocation invocation) throws Throwable {
		return doInvoke(getTarget(), invocation);
	}
}

@@ -932,16 +932,71 @@
 ert;%0D%0A%0D%0A
+import java.lang.reflect.InvocationTargetException;%0D%0A%0D%0A
 /**%0D%0A * 
@@ -1601,18 +1601,43 @@
 ll!%22);%0D%0A
-%09%09
+        try %7B%0D%0A            
 return i
@@ -1703,17 +1703,123 @@
 ts());%0D%0A
-%09
+        %7D catch (InvocationTargetException e) %7B%0D%0A            throw e.getTargetException();%0D%0A        %7D%0D%0A    
 %7D%0D%0A%0D%0A%09/*

throw the target exception raised rather than the wrapping InvocationTargetException