This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit 35bffc1e80eb334852613a756063e197eac57c03 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 3 15:19:17 2014 +0100 Refreshed the CommonJ patch --- debian/patches/0005_commonj.diff | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/debian/patches/0005_commonj.diff b/debian/patches/0005_commonj.diff index 052ca4e..4d024dc 100644 --- a/debian/patches/0005_commonj.diff +++ b/debian/patches/0005_commonj.diff @@ -7,9 +7,9 @@ Author: Miguel Landaeta <[email protected]> Last-Update: 2010-07-04 Forwarded: no ---- a/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java -+++ b/projects/org.springframework.context.support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java -@@ -146,20 +146,22 @@ +--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java ++++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java +@@ -121,20 +121,22 @@ public void execute(Runnable task) { Assert.state(this.workManager != null, "No WorkManager specified"); Work work = new DelegatingWork(task); @@ -34,19 +34,17 @@ Forwarded: no } public void execute(Runnable task, long startTimeout) { -@@ -191,13 +193,13 @@ +@@ -165,11 +167,11 @@ + // Implementation of the CommonJ WorkManager interface //------------------------------------------------------------------------- - public WorkItem schedule(Work work) -- throws WorkException, IllegalArgumentException { -+ throws IllegalArgumentException { - +- public WorkItem schedule(Work work) throws WorkException, IllegalArgumentException { ++ public WorkItem schedule(Work work) throws IllegalArgumentException { return this.workManager.schedule(work); } - public WorkItem schedule(Work work, WorkListener workListener) -- throws WorkException, IllegalArgumentException { -+ throws IllegalArgumentException { - +- public WorkItem schedule(Work work, WorkListener workListener) throws WorkException { ++ public WorkItem schedule(Work work, WorkListener workListener) { return this.workManager.schedule(work, workListener); } + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
