Skip to content
This repository has been archived by the owner on Jul 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #137 from tkrille/fix-iae-from-jackson
Browse files Browse the repository at this point in the history
[fix] IllegalArgumentException from Jackson when searching resources
  • Loading branch information
dacrome committed Jun 1, 2015
2 parents be31fe3 + 05cf493 commit 0a523a5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# OSIAM Connector4Java

## 1.5.1 - 2015-06-01

### Fixes

- IllegalArgumentException from Jackson when searching for resources

## 1.5 - 2015-06-01

### Features
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<groupId>org.osiam</groupId>
<artifactId>connector4java</artifactId>
<version>1.6-SNAPSHOT</version>
<version>1.5.1-SNAPSHOT</version>

<name>OSIAM Connector 4 Java</name>
<description>Native Java API to connect to the REST based OSIAM services</description>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/osiam/client/AbstractOsiamService.java
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ protected SCIMSearchResult<T> searchResources(Query query, AccessToken accessTok

try {
JavaType queryResultType = TypeFactory.defaultInstance()
.constructParametricType(SCIMSearchResult.class, SCIMSearchResult.class, type);
.constructParametricType(SCIMSearchResult.class, type);

return mapper.readValue(content, queryResultType);
} catch (IOException e) {
Expand Down

0 comments on commit 0a523a5

Please sign in to comment.