Commitcd5e3af

committed

check for java.util.Base64 presence

1 parentba12ff6 commitcd5e3afCopy full SHA for cd5e3af

File tree

+13

-1

lines changed

scribejava-core/src/main/java/com/github/scribejava/core/base64
- Base64.java
- Java8Base64.java

+13

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,11 @@ public static Base64 getInstance() {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`privatestaticBase64createInstance() {`
`22`		`-returnnewJava8Base64();`
	`22`	`+if (Java8Base64.isAvailable()) {`
	`23`	`+returnnewJava8Base64();`
	`24`	`+ }`
	`25`	`+thrownewIllegalStateException(`
	`26`	`+"No Base64 implementation was provided. Java 8 Base64, Apache commons codec or JAXB is needed");`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`publicstaticvoidinit(Base64base64) {`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,12 @@ protected byte[] internalDecodeMime(String string) {`
`20`	`20`	`returnJAVA8_BASE64.internalDecodeMime(string);`
`21`	`21`	`}`
`22`	`22`
	`23`	`+staticbooleanisAvailable() {`
	`24`	`+try {`
	`25`	`+Class.forName("java.util.Base64",false,Java8Base64.class.getClassLoader());`
	`26`	`+returntrue;`
	`27`	`+ }catch (ClassNotFoundExceptioncnfE) {`
	`28`	`+returnfalse;`
	`29`	`+ }`
	`30`	`+ }`
`23`	`31`	`}`

Comments

(0)