Browse Source

Merge "NetRCCredentialsProvider should return false if any item is missing"

stable-4.3
Christian Halstrick 9 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
5c66ad5684
  1. 7
      org.eclipse.jgit/src/org/eclipse/jgit/transport/ChainingCredentialsProvider.java
  2. 14
      org.eclipse.jgit/src/org/eclipse/jgit/transport/CredentialsProvider.java
  3. 3
      org.eclipse.jgit/src/org/eclipse/jgit/transport/NetRCCredentialsProvider.java

7
org.eclipse.jgit/src/org/eclipse/jgit/transport/ChainingCredentialsProvider.java

@ -127,11 +127,4 @@ public class ChainingCredentialsProvider extends CredentialsProvider {
} }
return false; return false;
} }
private boolean isAnyNull(CredentialItem... items) {
for (CredentialItem i : items)
if (i == null)
return true;
return false;
}
} }

14
org.eclipse.jgit/src/org/eclipse/jgit/transport/CredentialsProvider.java

@ -80,6 +80,20 @@ public abstract class CredentialsProvider {
defaultProvider = p; defaultProvider = p;
} }
/**
* @param items
* credential items to check
* @return {@code true} if any of the passed items is null, {@code false}
* otherwise
* @since 4.2
*/
protected static boolean isAnyNull(CredentialItem... items) {
for (CredentialItem i : items)
if (i == null)
return true;
return false;
}
/** /**
* Check if the provider is interactive with the end-user. * Check if the provider is interactive with the end-user.
* *

3
org.eclipse.jgit/src/org/eclipse/jgit/transport/NetRCCredentialsProvider.java

@ -105,12 +105,11 @@ public class NetRCCredentialsProvider extends CredentialsProvider {
throw new UnsupportedCredentialItem(uri, i.getClass().getName() throw new UnsupportedCredentialItem(uri, i.getClass().getName()
+ ":" + i.getPromptText()); //$NON-NLS-1$ + ":" + i.getPromptText()); //$NON-NLS-1$
} }
return true; return !isAnyNull(items);
} }
@Override @Override
public boolean isInteractive() { public boolean isInteractive() {
return false; return false;
} }
} }

Loading…
Cancel
Save