Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8339AB830 for ; Fri, 20 Jan 2012 21:06:28 +0000 (UTC) Received: (qmail 72425 invoked by uid 500); 20 Jan 2012 21:06:28 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 72359 invoked by uid 500); 20 Jan 2012 21:06:27 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 72352 invoked by uid 99); 20 Jan 2012 21:06:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jan 2012 21:06:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 20 Jan 2012 21:06:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0CFC623888FE for ; Fri, 20 Jan 2012 21:06:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1234137 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java Date: Fri, 20 Jan 2012 21:06:05 -0000 To: commits@camel.apache.org From: hadrian@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120120210606.0CFC623888FE@eris.apache.org> Author: hadrian Date: Fri Jan 20 21:06:05 2012 New Revision: 1234137 URL: http://svn.apache.org/viewvc?rev=1234137&view=rev Log: Merged revisions 1227595 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1227595 | davsclaus | 2012-01-05 08:56:00 -0500 (Thu, 05 Jan 2012) | 1 line CAMEL-4796: Applied the remove NON-NLS patch. Thanks to Babak. ........ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Jan 20 21:06:05 2012 @@ -1 +1 @@ -/camel/trunk:1-1227196,1227209,1227212,1227310-1227433,1227502,1227540,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269,1233398,1233442,1234043 +/camel/trunk:1-1227196,1227209,1227212,1227310-1227433,1227502,1227540,1227595,1228015,1228027,1228223,1228879,1229565,1231135,1231704,1232309,1232312,1232429,1232763,1232782,1232834,1233183,1233259,1233269,1233398,1233442,1234043 Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java?rev=1234137&r1=1234136&r2=1234137&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java Fri Jan 20 21:06:05 2012 @@ -139,7 +139,7 @@ abstract class AbstractTracked { continue; } if (DEBUG) { - System.out.println("AbstractTracked.setInitial: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.setInitial: " + item); } initial.add(item); } @@ -169,7 +169,7 @@ abstract class AbstractTracked { if (tracked.get(item) != null) { /* if we are already tracking this item */ if (DEBUG) { - System.out.println("AbstractTracked.trackInitial[already tracked]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.trackInitial[already tracked]: " + item); } continue; /* skip this item */ } @@ -178,14 +178,14 @@ abstract class AbstractTracked { * if this item is already in the process of being added. */ if (DEBUG) { - System.out.println("AbstractTracked.trackInitial[already adding]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.trackInitial[already adding]: " + item); } continue; /* skip this item */ } adding.add(item); } if (DEBUG) { - System.out.println("AbstractTracked.trackInitial: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.trackInitial: " + item); } trackAdding(item, null); /* * Begin tracking it. We call trackAdding @@ -220,14 +220,14 @@ abstract class AbstractTracked { if (adding.contains(item)) { /* if this item is already in the process of being added. */ if (DEBUG) { - System.out.println("AbstractTracked.track[already adding]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.track[already adding]: " + item); } return; } adding.add(item); /* mark this item is being added */ } else { /* we are currently tracking this item */ if (DEBUG) { - System.out.println("AbstractTracked.track[modified]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.track[modified]: " + item); } modified(); /* increment modification count */ } @@ -256,7 +256,7 @@ abstract class AbstractTracked { @SuppressWarnings("unchecked") private void trackAdding(final Object item, final Object related) { if (DEBUG) { - System.out.println("AbstractTracked.trackAdding: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.trackAdding: " + item); } Object object = null; boolean becameUntracked = false; @@ -289,7 +289,7 @@ abstract class AbstractTracked { */ if (becameUntracked && (object != null)) { if (DEBUG) { - System.out.println("AbstractTracked.trackAdding[removed]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.trackAdding[removed]: " + item); } /* Call customizer outside of synchronized region */ customizerRemoved(item, related, object); @@ -314,7 +314,7 @@ abstract class AbstractTracked { * of initial references to process */ if (DEBUG) { - System.out.println("AbstractTracked.untrack[removed from initial]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.untrack[removed from initial]: " + item); } return; /* * we have removed it from the list and it will not be @@ -327,7 +327,7 @@ abstract class AbstractTracked { * added */ if (DEBUG) { - System.out.println("AbstractTracked.untrack[being added]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.untrack[being added]: " + item); } return; /* * in case the item is untracked while in the process of @@ -344,7 +344,7 @@ abstract class AbstractTracked { modified(); /* increment modification count */ } if (DEBUG) { - System.out.println("AbstractTracked.untrack[removed]: " + item); //$NON-NLS-1$ + System.out.println("AbstractTracked.untrack[removed]: " + item); } /* Call customizer outside of synchronized region */ customizerRemoved(item, related, object); Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java?rev=1234137&r1=1234136&r2=1234137&view=diff ============================================================================== --- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java (original) +++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java Fri Jan 20 21:06:05 2012 @@ -149,7 +149,7 @@ public class BundleTracker implements Bu return; } if (DEBUG) { - System.out.println("BundleTracker.open"); //$NON-NLS-1$ + System.out.println("BundleTracker.open"); } t = new Tracked(); synchronized (t) { @@ -192,7 +192,7 @@ public class BundleTracker implements Bu return; } if (DEBUG) { - System.out.println("BundleTracker.close"); //$NON-NLS-1$ + System.out.println("BundleTracker.close"); } outgoing.close(); bundles = getBundles(); @@ -400,7 +400,7 @@ public class BundleTracker implements Bu final Bundle bundle = event.getBundle(); final int state = bundle.getState(); if (DEBUG) { - System.out.println("BundleTracker.Tracked.bundleChanged[" + state + "]: " + bundle); //$NON-NLS-1$ //$NON-NLS-2$ + System.out.println("BundleTracker.Tracked.bundleChanged[" + state + "]: " + bundle); } if ((state & mask) != 0) {