Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CEA7F6AAC for ; Sun, 5 Jun 2011 03:27:39 +0000 (UTC) Received: (qmail 46798 invoked by uid 500); 5 Jun 2011 03:27:39 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 46525 invoked by uid 500); 5 Jun 2011 03:27:39 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 46518 invoked by uid 99); 5 Jun 2011 03:27:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Jun 2011 03:27:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Jun 2011 03:27:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C96BD2388BEF; Sun, 5 Jun 2011 03:27:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1131592 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java Date: Sun, 05 Jun 2011 03:27:14 -0000 To: commits@struts.apache.org From: mcucchiara@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110605032714.C96BD2388BEF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcucchiara Date: Sun Jun 5 03:27:14 2011 New Revision: 1131592 URL: http://svn.apache.org/viewvc?rev=1131592&view=rev Log: WW-3643 - regression for java 1.5 (@Override annotation) Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java?rev=1131592&r1=1131591&r2=1131592&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java Sun Jun 5 03:27:14 2011 @@ -1,17 +1,22 @@ /* - * Copyright 2002-2006,2009 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package com.opensymphony.xwork2; @@ -205,9 +210,7 @@ public class DefaultActionProxy implemen } } - @Override - public boolean isMethodSpecified() - { + public boolean isMethodSpecified() { return methodSpecified; } }