From ceb50e397bafb1f59dcedf2b54adfa382b560ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=B5=A9?= Date: Sat, 14 May 2016 00:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/hsweb/concurrent/lock/annotation/Lock.java | 2 +- .../java/org/hsweb/concurrent/lock/annotation/LockName.java | 2 +- .../java/org/hsweb/concurrent/lock/annotation/ReadLock.java | 2 +- .../java/org/hsweb/concurrent/lock/annotation/WriteLock.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/Lock.java b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/Lock.java index 4454a83d9..a0b1a78d6 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/Lock.java +++ b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/Lock.java @@ -14,7 +14,7 @@ public @interface Lock { String condition() default ""; - long waitTime() default Long.MAX_VALUE; + long waitTime() default 5; TimeUnit timeUnit() default TimeUnit.SECONDS; } diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/LockName.java b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/LockName.java index 5590ff462..c84d79ed3 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/LockName.java +++ b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/LockName.java @@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit; public @interface LockName { String value(); - boolean expression() default false; + boolean isExpression() default false; String expressionLanguage() default "spel"; } diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/ReadLock.java b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/ReadLock.java index 2d9506b7a..0fb68cfd6 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/ReadLock.java +++ b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/ReadLock.java @@ -14,7 +14,7 @@ public @interface ReadLock { String condition() default ""; - long waitTime() default Long.MAX_VALUE; + long waitTime() default 5; TimeUnit timeUnit() default TimeUnit.SECONDS; } diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/WriteLock.java b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/WriteLock.java index 44f939bb9..f6bf1a878 100644 --- a/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/WriteLock.java +++ b/hsweb-web-concurrent/hsweb-web-concurrent-lock/src/main/java/org/hsweb/concurrent/lock/annotation/WriteLock.java @@ -14,7 +14,7 @@ public @interface WriteLock { String condition() default ""; - long waitTime() default Long.MAX_VALUE; + long waitTime() default 5; TimeUnit timeUnit() default TimeUnit.SECONDS; }