@@ -163,27 +163,36 @@ public OAuthTokens findOAuthTokens(final Host bookmark) {
163163 }
164164
165165 protected static Scheme getOAuthScheme (final Host bookmark ) {
166- final URI uri = URI .create (bookmark .getProtocol ().getOAuthTokenUrl ());
167- if (null == uri .getScheme ()) {
168- return bookmark .getProtocol ().getScheme ();
166+ if (null != bookmark .getProtocol ().getOAuthTokenUrl ()) {
167+ final URI uri = URI .create (bookmark .getProtocol ().getOAuthTokenUrl ());
168+ if (null == uri .getScheme ()) {
169+ return bookmark .getProtocol ().getScheme ();
170+ }
171+ return Scheme .valueOf (uri .getScheme ());
169172 }
170- return Scheme . valueOf ( uri . getScheme ()) ;
173+ return null ;
171174 }
172175
173176 protected static String getOAuthHostname (final Host bookmark ) {
174- final URI uri = URI .create (bookmark .getProtocol ().getOAuthTokenUrl ());
175- if (StringUtils .isNotBlank (uri .getHost ())) {
176- return uri .getHost ();
177+ if (null != bookmark .getProtocol ().getOAuthTokenUrl ()) {
178+ final URI uri = URI .create (bookmark .getProtocol ().getOAuthTokenUrl ());
179+ if (StringUtils .isNotBlank (uri .getHost ())) {
180+ return uri .getHost ();
181+ }
182+ return bookmark .getHostname ();
177183 }
178- return bookmark . getHostname () ;
184+ return null ;
179185 }
180186
181187 protected static int getOAuthPort (final Host bookmark ) {
182- final URI uri = URI .create (bookmark .getProtocol ().getOAuthTokenUrl ());
183- if (-1 != uri .getPort ()) {
184- return uri .getPort ();
188+ if (null != bookmark .getProtocol ().getOAuthTokenUrl ()) {
189+ final URI uri = URI .create (bookmark .getProtocol ().getOAuthTokenUrl ());
190+ if (-1 != uri .getPort ()) {
191+ return uri .getPort ();
192+ }
193+ return getOAuthScheme (bookmark ).getPort ();
185194 }
186- return getOAuthScheme ( bookmark ). getPort () ;
195+ return - 1 ;
187196 }
188197
189198 protected static Set <String > getOAuthPrefix (final Host bookmark ) {
0 commit comments