svn commit: r1172819 - in /camel/branches/camel-2.8.x: ./ components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java

[dkulp]

Author: dkulp
Date: Mon Sep 19 21:07:37 2011
New Revision: 1172819

URL: http://svn.apache.org/viewvc?rev=1172819&view=rev
Log:
Merged revisions 1159323 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1159323 | hadrian | 2011-08-18 13:42:35 -0400 (Thu, 18 Aug 2011) | 1 line
  
  Bothering to build before a commit...
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /camel/trunk:1159323

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java?rev=1172819&r1=1172818&r2=1172819&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
 Mon Sep 19 21:07:37 2011
@@ -81,7 +81,7 @@ public class NagiosConfiguration impleme
                     
nagiosSettings.setEncryptionMethod(Encryption.NO_ENCRYPTION);
                 } else if (NagiosEncryptionMethod.Xor == encryptionMethod) {
                     
nagiosSettings.setEncryptionMethod(Encryption.XOR_ENCRYPTION);
-                } else if (NagiosEncryptionMethod.TripeDes == 
encryptionMethod) {
+                } else if (NagiosEncryptionMethod.TripleDes == 
encryptionMethod) {
                     
nagiosSettings.setEncryptionMethod(Encryption.TRIPLE_DES_ENCRYPTION);
                 } else {
                     throw new IllegalArgumentException("Unknown encryption 
method: " + encryptionMethod);