[jboss-cvs] JBossAS SVN: r111784 - in branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator: exceptions and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thauser at redhat.com
Date: 2011-07-19 17:00:40 -0400 (Tue, 19 Jul 2011)
New Revision: 111784

Modified:
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/exceptions/NotEnoughInformationException.java
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/MappedAttribute.java
Log:
merging from mobicents

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java	2011-07-19 20:55:28 UTC (rev 111783)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/Generator.java	2011-07-19 21:00:40 UTC (rev 111784)
@@ -237,6 +237,7 @@
 					}
 				}
 				catch (NotEnoughInformationException e){
+					e.printStackTrace();
 					System.err.println(e.getMessage());
 					System.exit(1);
 				}
@@ -263,6 +264,7 @@
 						tableList.add(mibT);
 					}
 					catch (NotEnoughInformationException e){
+						e.printStackTrace();
 						System.err.println(e.getMessage());
 						System.exit(1);
 					}
@@ -280,6 +282,7 @@
 					mibnList.add(mibN);
 				}
 				catch (NotEnoughInformationException e){
+					e.printStackTrace();
 					System.err.println(e.getMessage());
 					System.exit(1);
 				}

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/exceptions/NotEnoughInformationException.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/exceptions/NotEnoughInformationException.java	2011-07-19 20:55:28 UTC (rev 111783)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/exceptions/NotEnoughInformationException.java	2011-07-19 21:00:40 UTC (rev 111784)
@@ -1,4 +1,4 @@
-package org.jboss.jmx.adaptor.snmp.generator;
+package org.jboss.jmx.adaptor.snmp.generator.exceptions;
 /** This exception is thrown when there is not enough information inside the input files 
  *  to create a complete, valid MIB.
  *  

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/MappedAttribute.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/MappedAttribute.java	2011-07-19 20:55:28 UTC (rev 111783)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/generator/metrics/MappedAttribute.java	2011-07-19 21:00:40 UTC (rev 111784)
@@ -186,20 +186,13 @@
 		String fullOidThis = this.oidPrefix+"."+this.oid;
 		String fullOidThat = that.oidPrefix+"."+that.oid;
 		return (fullOidThis.equals(fullOidThat));
-		
-		
 	}
 	
 	@Override 
 	public int hashCode(){
-		int result = 1;
+		int result = 4;
 		int PRIME = 31;
-		if (this.oidPrefix == null)
-			return PRIME * result + this.oid.hashCode();
-		else {
-			String fullOid = this.oidPrefix+"."+this.oid;
-			return PRIME * result + fullOid.hashCode();
-		}	
-			
+		String fullOid = this.oidPrefix+"."+this.oid;
+		return PRIME * result + fullOid.hashCode();			
 	}
 }