Return-Path: 
 <aries-commits-return-744-apmail-incubator-aries-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org
Received: (qmail 89157 invoked from network); 3 Mar 2010 17:01:51 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 3 Mar 2010 17:01:51 -0000
Received: (qmail 87773 invoked by uid 500); 3 Mar 2010 17:01:43 -0000
Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org
Received: (qmail 87724 invoked by uid 500); 3 Mar 2010 17:01:43 -0000
Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:aries-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:aries-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:aries-commits@incubator.apache.org>
List-Id: <aries-commits.incubator.apache.org>
Reply-To: aries-dev@incubator.apache.org
Delivered-To: mailing list aries-commits@incubator.apache.org
Received: (qmail 87716 invoked by uid 99); 3 Mar 2010 17:01:43 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Mar 2010 17:01:43 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Mar 2010 17:01:42 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1C6C523888D2; Wed,  3 Mar 2010 17:01:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r918571 -
 /incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java
Date: Wed, 03 Mar 2010 17:01:21 -0000
To: aries-commits@incubator.apache.org
From: not@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100303170121.1C6C523888D2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: not
Date: Wed Mar  3 17:01:20 2010
New Revision: 918571

URL: http://svn.apache.org/viewvc?rev=918571&view=rev
Log:
ARIES-128 Fix the fallback mechanism to find the BundleContext by looking at the stack (currently it gets it very very very wrong).

Modified:
    incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java

Modified: incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java?rev=918571&r1=918570&r2=918571&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java (original)
+++ incubator/aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java Wed Mar  3 17:01:20 2010
@@ -129,12 +129,7 @@
     }
     
     if (result == null) {
-      StackTraceElement[] stackTrace = AccessController.doPrivileged(new PrivilegedAction<StackTraceElement[]>() {
-        public StackTraceElement[] run()
-        {
-          return Thread.currentThread().getStackTrace();
-        }
-      });
+      StackTraceElement[] stackTrace =  Thread.currentThread().getStackTrace();
       
       StackFinder finder = new StackFinder();
       Class<?>[] classStack = finder.getClassContext();
@@ -152,6 +147,7 @@
       }
       
       if (found) {
+        i--; // we need to move back an item because the previous loop leaves us one after where we wanted to be
         Set<Integer> classLoadersChecked = new HashSet<Integer>();
         for (; i < classStack.length && result == null; i++) {
           ClassLoader cl = classStack[i].getClassLoader();