diff options
| author | jesus m. rodriguez <jesusr@redhat.com> | 2009-11-11 12:47:34 -0500 |
|---|---|---|
| committer | jesus m. rodriguez <jesusr@redhat.com> | 2009-11-11 12:47:34 -0500 |
| commit | dc1c95f3aab08c8daf0cc5d9b6ffcda7b94c0cb5 (patch) | |
| tree | 30a1ebebc63cbaeb31d2c54d523e3fd6a0c19e08 | |
| parent | e797eb3f1abc98d869fffb9e86b342538ce50475 (diff) | |
| parent | e372d8ad99ea9b2bbfb20e711c3faf906c2b0ef8 (diff) | |
| download | candlepin-dc1c95f3aab08c8daf0cc5d9b6ffcda7b94c0cb5.tar.gz candlepin-dc1c95f3aab08c8daf0cc5d9b6ffcda7b94c0cb5.tar.xz candlepin-dc1c95f3aab08c8daf0cc5d9b6ffcda7b94c0cb5.zip | |
Merge branch 'master' into buildr
| -rw-r--r-- | proxy/src/main/java/com/redhat/rhn/common/cert/Certificate.java | 3 | ||||
| -rw-r--r-- | proxy/src/main/java/com/redhat/rhn/common/cert/CertificateFactory.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/proxy/src/main/java/com/redhat/rhn/common/cert/Certificate.java b/proxy/src/main/java/com/redhat/rhn/common/cert/Certificate.java index 3b5f22a..ddedfaf 100644 --- a/proxy/src/main/java/com/redhat/rhn/common/cert/Certificate.java +++ b/proxy/src/main/java/com/redhat/rhn/common/cert/Certificate.java @@ -50,7 +50,8 @@ public class Certificate { private String generation; private String signature; private List channelFamilies; - private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; + private static final String XML_HEADER = + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; /** * Construct an empty certificate. diff --git a/proxy/src/main/java/com/redhat/rhn/common/cert/CertificateFactory.java b/proxy/src/main/java/com/redhat/rhn/common/cert/CertificateFactory.java index a57586f..2601215 100644 --- a/proxy/src/main/java/com/redhat/rhn/common/cert/CertificateFactory.java +++ b/proxy/src/main/java/com/redhat/rhn/common/cert/CertificateFactory.java @@ -108,8 +108,8 @@ public class CertificateFactory { Certificate result = new Certificate(); Element root = doc.getRootElement(); if (!ELEM_CERT.equals(root.getName())) { - throw new JDOMException("Expected root element in " + source + " to be " + - ELEM_CERT + " but found " + root.getName()); + throw new JDOMException("Expected root element in " + source + + " to be " + ELEM_CERT + " but found " + root.getName()); } Element signature = root.getChild(ELEM_SIGNATURE); if (signature == null) { |