From b4c651af18db35666260fa7f1020c76a29f96a13 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 9 Nov 2010 15:19:40 +0000 Subject: Bug 329805 - Compiler warnings in N20101108-2000 build --- .../org/eclipse/core/runtime/internal/stats/ClassloaderStats.java | 5 +---- .../osgi/internal/signedcontent/SignatureBlockProcessor.java | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/ClassloaderStats.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/ClassloaderStats.java index 0a56fe7aa..f34da3da3 100644 --- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/ClassloaderStats.java +++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/stats/ClassloaderStats.java @@ -20,7 +20,6 @@ import java.util.*; public class ClassloaderStats { private String id; private long loadingTime; // time spent loading classes - private int failureCount = 0; // number of classes requested but that we fail to provide /** * classes loaded by the plugin (key: class name, value: ClassStats) */ @@ -167,10 +166,8 @@ public class ClassloaderStats { private synchronized void endLoadClass(String name, boolean success) { ClassStats current = getClassStack().pop(); - if (!success) { - failureCount++; + if (!success) return; - } if (current.getLoadOrder() >= 0) return; diff --git a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java index dc944cf59..30f43f882 100644 --- a/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java +++ b/bundles/org.eclipse.osgi/security/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2010 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -54,8 +54,8 @@ public class SignatureBlockProcessor implements SignedContentConstants { byte manifestBytes[] = readIntoArray(be); // process the signers - Iterator iSigners = signers.iterator(); - for (int i = 0; iSigners.hasNext(); i++) + + for (Iterator iSigners = signers.iterator(); iSigners.hasNext();) processSigner(wrappedBundleFile, manifestBytes, iSigners.next()); // done processing now create a SingedContent to return -- cgit v1.2.3