# HG changeset patch
# User lana
# Date 1440099011 25200
# Node ID 42ae657e0e104fa7877996b8095f2e3ab1596118
# Parent fc042e09e440dc768bbc169ba529a1c86cf154ad# Parent b03272850e68f6a8685d47c467ecd776d623dbb5
Merge
diff -r fc042e09e440 -r 42ae657e0e10 src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java
--- a/src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java Thu Aug 20 11:38:21 2015 -0700
+++ b/src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java Thu Aug 20 12:30:11 2015 -0700
@@ -39,7 +39,6 @@
* method can be annotated with this annotation. The method on which the
* PostConstruct annotation is applied MUST fulfill all of the following
* criteria:
- *
*
* - The method MUST NOT have any parameters except in the case of
* interceptors in which case it takes an InvocationContext object as
diff -r fc042e09e440 -r 42ae657e0e10 src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java
--- a/src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java Thu Aug 20 11:38:21 2015 -0700
+++ b/src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java Thu Aug 20 12:30:11 2015 -0700
@@ -38,7 +38,6 @@
* except the application client container in Java EE 5. The method on which
* the PreDestroy annotation is applied MUST fulfill all of the following
* criteria:
- *
*
* - The method MUST NOT have any parameters except in the case of
* interceptors in which case it takes an InvocationContext object as