Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2481] ignore other elements in the xml - e.g.
|
From: <ma...@rh...> - 2008-12-19 09:33:01
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2481] ignore other elements in the xml - e.g.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2481</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2008-12-19 03:32:58 -0600 (Fri, 19 Dec 2008)</dd> </dl> <h3>Log Message</h3> <pre>ignore other elements in the xml - e.g. <revision> can be found in the metadata, in addition to the ones we are looking for, which are <data type="x"></pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseserverpluginsyumsrcmainjavaorgrhqenterpriseserverpluginsyumRepodatajava">rhq/trunk/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repodata.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseserverpluginsyumsrcmainjavaorgrhqenterpriseserverpluginsyumRepodatajava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repodata.java (2480 => 2481)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repodata.java 2008-12-19 08:44:26 UTC (rev 2480) +++ rhq/trunk/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repodata.java 2008-12-19 09:32:58 UTC (rev 2481) </span><span class="lines">@@ -22,6 +22,7 @@ </span><span class="cx"> import java.util.HashMap; import java.util.List; import java.util.Map; </span><span class="add">+ </span><span class="cx"> import org.jdom.Element; import org.jdom.Namespace; import org.jdom.input.SAXBuilder; </span><span class="lines">@@ -183,9 +184,10 @@ </span><span class="cx"> private String getLocation(Element repomd, Meta type) { String href = ""; for (Element e : (List<Element>) repomd.getChildren()) { </span><span class="rem">- if (e.getAttributeValue("type").equals(type.name())) { - Element locaction = e.getChild("location", repons); - href = locaction.getAttributeValue("href"); </span><span class="add">+ String typeAttribute = e.getAttributeValue("type"); + if (typeAttribute != null && typeAttribute.equals(type.name())) { + Element location = e.getChild("location", repons); + href = location.getAttributeValue("href"); </span><span class="cx"> break; } } </span> </pre> </div> </div> </body> </html> |