Browse Source

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

tags/v4.2.0.201601211800-r
Christian Halstrick 8 years ago
parent
commit
5c66ad5684

+ 0
- 7
org.eclipse.jgit/src/org/eclipse/jgit/transport/ChainingCredentialsProvider.java View File

@@ -127,11 +127,4 @@ public class ChainingCredentialsProvider extends CredentialsProvider {
}
return false;
}

private boolean isAnyNull(CredentialItem... items) {
for (CredentialItem i : items)
if (i == null)
return true;
return false;
}
}

+ 14
- 0
org.eclipse.jgit/src/org/eclipse/jgit/transport/CredentialsProvider.java View File

@@ -80,6 +80,20 @@ public abstract class CredentialsProvider {
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.
*

+ 1
- 2
org.eclipse.jgit/src/org/eclipse/jgit/transport/NetRCCredentialsProvider.java View File

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

@Override
public boolean isInteractive() {
return false;
}

}

Loading…
Cancel
Save