You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/04/11 21:48:01 UTC
svn commit: r1324954 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
Author: hadrian
Date: Wed Apr 11 19:48:00 2012
New Revision: 1324954
URL: http://svn.apache.org/viewvc?rev=1324954&view=rev
Log:
Merged revisions 1310150 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1310150 | dkulp | 2012-04-05 21:37:01 -0400 (Thu, 05 Apr 2012) | 1 line
Fix an eclipse warning
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
Propchange: camel/branches/camel-2.9.x/
('svn:mergeinfo' removed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java?rev=1324954&r1=1324953&r2=1324954&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java Wed Apr 11 19:48:00 2012
@@ -58,7 +58,6 @@ public class DataFormatDefinition extend
* @param ref reference to lookup for a data format
* @return the data format or null if not possible to create
*/
- @SuppressWarnings("deprecation")
public static DataFormat getDataFormat(RouteContext routeContext, DataFormatDefinition type, String ref) {
if (type == null) {
ObjectHelper.notNull(ref, "ref or type");