Permalink
Browse files

Merge branch 'master' into jackson-serialization-issue-52

Conflicts:
	examples/blogging/.classpath
	examples/blogging/lib/mongodb/mongo-2.10.1.jar
	examples/blogging/src/java/com/kickstart/Configuration.java
	examples/blogging/src/java/com/kickstart/Main.java
  • Loading branch information...
2 parents 2e0aec0 + 2e563ca commit 71bf931b590a1facc2dc1a44af539fa91c805481 @tfredrich tfredrich committed Jan 28, 2013
Binary file not shown.
@@ -185,7 +185,7 @@ public CommentRepository getCommentRepository()
return commentRepository;
}
- public int getExecutorThreadPoolProperty()
+ public int getExecutorThreadPoolSize()
{
return executorThreadPoolSize;
}
@@ -36,7 +36,7 @@ public static void main(String[] args) throws Exception
.setName("Sample Blogging")
.setBaseUrl(config.getBaseUrl())
.setDefaultFormat(config.getDefaultFormat())
- .setExecutorThreadCount(config.getExecutorThreadPoolProperty())
+ .setExecutorThreadCount(config.getExecutorThreadPoolSize())
.putResponseProcessor(Format.JSON, ResponseProcessors.json())
.putResponseProcessor(Format.XML, ResponseProcessors.xml())
.putResponseProcessor(Format.WRAPPED_JSON, ResponseProcessors.wrappedJson())

0 comments on commit 71bf931

Please sign in to comment.