← Back to branch summary

~james-page/ubuntu/natty/tomcat6/fix-662588

« back to all changes in this revision

Viewing changes to java/org/apache/el/lang/FunctionMapperFactory.java

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Iulian Udrea
  • Date: 2009-06-09 12:35:19 UTC
  • mfrom: (1.2.1 upstream) (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090609123519-7owjbso5ttnka6ur
Tags: 6.0.20-1ubuntu1
https://launchpad.net/bugs/385262
[ Iulian Udrea ]
* Merge from debian unstable (LP: #385262), remaining changes:
  - debian/control, debian/rules: Use default-jdk to build
  - debian/control: Run using default-jre-headless by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/el/lang/FunctionMapperFactory.java
23
23
 
24
24
/**
25
25
 * @author Jacob Hookom [jacob@hookom.net]
26
 
 * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author: markt $
 
26
 * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author: rjung $
27
27
 */
28
28
public class FunctionMapperFactory extends FunctionMapper {
29
29
 
30
30
    protected FunctionMapperImpl memento = null;
31
31
    protected FunctionMapper target;
32
 
    
 
32
 
33
33
    public FunctionMapperFactory(FunctionMapper mapper) {
34
34
        if (mapper == null) {
35
35
            throw new NullPointerException("FunctionMapper target cannot be null");
36
36
        }
37
37
        this.target = mapper;
38
38
    }
39
 
   
40
 
    
 
39
 
 
40
 
41
41
    /* (non-Javadoc)
42
42
     * @see javax.el.FunctionMapper#resolveFunction(java.lang.String, java.lang.String)
43
43
     */
51
51
        }
52
52
        return m;
53
53
    }
54
 
    
 
54
 
55
55
    public FunctionMapper create() {
56
56
        return this.memento;
57
57
    }