Merge pull request #128 from arnested/discriminator

Fix discriminator.

Author: fehguy

modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java

@@ -691,7 +691,7 @@ public Model definition(ObjectNode node, String location, ParseResult result) {
             impl.setFormat(value);
 
             value = getString("discriminator", node, false, location, result);
-            impl.setDescription(value);
+            impl.setDiscriminator(value);
 
             JsonNode xml = node.get("xml");
             if(xml != null) {