From e9db7857990faf04ede61e973ad6422eb33ea915 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 10 Feb 2013 21:10:58 +0100 Subject: [PATCH] Polishing --- .../scheduling/support/CronTrigger.java | 12 ++++++------ .../springframework/core/GenericTypeResolver.java | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java index eca37982e6..94f6385a1a 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.scheduling.support; -import java.util.Date; -import java.util.TimeZone; - import org.springframework.scheduling.Trigger; import org.springframework.scheduling.TriggerContext; +import java.util.Date; +import java.util.TimeZone; + /** * {@link Trigger} implementation for cron expressions. * Wraps a {@link CronSequenceGenerator}. @@ -41,7 +41,7 @@ public class CronTrigger implements Trigger { * following cron expression conventions */ public CronTrigger(String cronExpression) { - this(cronExpression, TimeZone.getDefault()); + this.sequenceGenerator = new CronSequenceGenerator(cronExpression); } /** @@ -89,7 +89,7 @@ public class CronTrigger implements Trigger { @Override public String toString() { - return sequenceGenerator.toString(); + return this.sequenceGenerator.toString(); } } diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java index 3842a741c7..7d8045b51b 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java @@ -369,8 +369,7 @@ public abstract class GenericTypeResolver { * all super types, enclosing types and interfaces. */ public static Map getTypeVariableMap(Class clazz) { - Map ref = typeVariableCache.get(clazz); - Map typeVariableMap = (ref != null ? ref : null); + Map typeVariableMap = typeVariableCache.get(clazz); if (typeVariableMap == null) { typeVariableMap = new HashMap();