stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8276042: Remove unused local variables in java.naming

Browse Source 
Reviewed-by: aefimov, dfuchs, vtewari
This commit is contained in:
Andrey Turbanov 2021-10-28 08:42:10 +00:00 committed by Aleksei Efimov
parent a2f2d8fcf5
commit 593401fe8b
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java.naming/share/classes/com/sun/jndi/ldap/Filter.java
View File

@ -307,7 +307,6 @@ final class Filter {
dbgIndent++; dbgIndent++;
} }
String type, value;
int valueStart, valueEnd, typeStart, typeEnd; int valueStart, valueEnd, typeStart, typeEnd;
int eq; int eq;

1
src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java
View File

@ -2603,7 +2603,6 @@ public final class LdapCtx extends ComponentDirContext
Vector<Vector<String>> referrals = new Vector<>(urlCount); Vector<Vector<String>> referrals = new Vector<>(urlCount);
int iURL; int iURL;
int i = 0;
separator = refString.indexOf('\n'); separator = refString.indexOf('\n');
iURL = separator + 1; iURL = separator + 1;

4
src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -73,7 +73,7 @@ class SaslOutputStream extends FilterOutputStream {
*/ */
public void write(byte[] buffer, int offset, int total) throws IOException { public void write(byte[] buffer, int offset, int total) throws IOException {
int count; int count;
byte[] wrappedToken, saslBuffer; byte[] wrappedToken;
// "Packetize" buffer to be within rawSendSize // "Packetize" buffer to be within rawSendSize
if (debug) { if (debug) {

6
src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -134,7 +134,7 @@ public class Continuation extends ResolveResult {
/** /**
* Fills in an exception's fields using data from this Continuation. * Fills in an exception's fields using data from this Continuation.
* The resolved name is set by subtracting remainingName from starter. * The resolved name is set by subtracting remainingName from starter.
* %%% This might not not always produce the correct answer wrt trailing "/". * %%% This might not always produce the correct answer wrt trailing "/".
* If the exception is a CannotProceedException, its environment, * If the exception is a CannotProceedException, its environment,
* altName, and altNameCtx fields are set using this continuation's * altName, and altNameCtx fields are set using this continuation's
* environment, relativeResolvedName, and resolvedContext. * environment, relativeResolvedName, and resolvedContext.
@ -296,8 +296,6 @@ public class Continuation extends ResolveResult {
* @param currCtx The non-null context from which relResName is to be resolved. * @param currCtx The non-null context from which relResName is to be resolved.
*/ */
public void setContinueNNS(Object resObj, Name relResName, Context currCtx) { public void setContinueNNS(Object resObj, Name relResName, Context currCtx) {
CompositeName rname = new CompositeName();
setContinue(resObj, relResName, currCtx, PartialCompositeContext._NNS_NAME); setContinue(resObj, relResName, currCtx, PartialCompositeContext._NNS_NAME);
} }

7
src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -510,12 +510,11 @@ public abstract class PartialCompositeContext implements Context, Resolver {
throws NamingException { throws NamingException {
Object obj = cont.getResolvedObj(); Object obj = cont.getResolvedObj();
PartialCompositeContext pctx = null;
if (obj instanceof PartialCompositeContext) { if (obj instanceof PartialCompositeContext partialCtx) {
// Just cast if octx already is PartialCompositeContext // Just cast if octx already is PartialCompositeContext
// %%% ignoring environment for now // %%% ignoring environment for now
return (PartialCompositeContext)obj; return partialCtx;
} else { } else {
throw cont.fillInException(new CannotProceedException()); throw cont.fillInException(new CannotProceedException());
} }