Skip to content

Commit

Permalink
Do not depend on java.rmi.* when not necessary.
Browse files Browse the repository at this point in the history
This is small correction of fix committed in r25814. We need to swap
terms in logical conjuction so java.rmi.* stuff is accessed only if
triggered by @Remote annotation.

No review.
  • Loading branch information
gkossakowski committed Oct 17, 2011
1 parent 240fb16 commit 6974cca
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,8 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with
*/
private def addRemoteException(jmethod: JMethod, meth: Symbol) {
val needsAnnotation = (
!(meth.throwsAnnotations contains RemoteExceptionClass)
&& (isRemoteClass || (meth hasAnnotation RemoteAttr) && jmethod.isPublic)
(isRemoteClass || (meth hasAnnotation RemoteAttr) && jmethod.isPublic)
&& !(meth.throwsAnnotations contains RemoteExceptionClass)
)
if (needsAnnotation) {
val c = Constant(RemoteExceptionClass.tpe)
Expand Down

0 comments on commit 6974cca

Please sign in to comment.