From 5bebf9bcec5b00c3213f61879c0654c264ce8982 Mon Sep 17 00:00:00 2001 From: serprime Date: Mon, 25 Oct 2010 19:05:19 +0200 Subject: [PATCH 1/2] fixed Exception when assigning scope for service (IllegalArgumentException: OAuth parameters must either be scope or start with 'oauth_') --- src/main/java/org/scribe/model/OAuthRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/scribe/model/OAuthRequest.java b/src/main/java/org/scribe/model/OAuthRequest.java index ec7f02308..e3962e22c 100644 --- a/src/main/java/org/scribe/model/OAuthRequest.java +++ b/src/main/java/org/scribe/model/OAuthRequest.java @@ -41,7 +41,7 @@ public void addOAuthParameter(String key, String value) private String checkKey(String key) { - if (!key.startsWith(OAUTH_PREFIX) || !key.equals(OAuthConstants.SCOPE)) + if (!key.startsWith(OAUTH_PREFIX) && !key.equals(OAuthConstants.SCOPE)) { throw new IllegalArgumentException(String.format("OAuth parameters must either be %s or start with '%s'", OAuthConstants.SCOPE, OAUTH_PREFIX)); } else From ead5087130eae2d7f387757365c96649c49f58b5 Mon Sep 17 00:00:00 2001 From: serprime Date: Mon, 25 Oct 2010 19:22:45 +0200 Subject: [PATCH 2/2] fixed Exception when assigning scope for service (IllegalArgumentException: OAuth parameters must either be scope or start with 'oauth_')... really now --- src/main/java/org/scribe/model/OAuthRequest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/scribe/model/OAuthRequest.java b/src/main/java/org/scribe/model/OAuthRequest.java index e3962e22c..69aeb75d4 100644 --- a/src/main/java/org/scribe/model/OAuthRequest.java +++ b/src/main/java/org/scribe/model/OAuthRequest.java @@ -41,12 +41,12 @@ public void addOAuthParameter(String key, String value) private String checkKey(String key) { - if (!key.startsWith(OAUTH_PREFIX) && !key.equals(OAuthConstants.SCOPE)) + if (key.startsWith(OAUTH_PREFIX) || key.equals(OAuthConstants.SCOPE)) { - throw new IllegalArgumentException(String.format("OAuth parameters must either be %s or start with '%s'", OAuthConstants.SCOPE, OAUTH_PREFIX)); + return key; } else { - return key; + throw new IllegalArgumentException(String.format("OAuth parameters must either be %s or start with '%s'", OAuthConstants.SCOPE, OAUTH_PREFIX)); } }